nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-12-03 04:04:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fallout from deprecation

Browse Source
This commit is contained in:
Aaron Turon 2014-11-21 12:51:22 -08:00
parent 7ce2d9c3fa
commit 6733d8b483
3 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libstd/ascii.rs
View File

@ -13,6 +13,7 @@
//! Operations on ASCII strings and characters
#![unstable = "unsure about placement and naming"]
#![allow(deprecated)]
use core::kinds::Sized;
use fmt;
@ -36,6 +37,7 @@ impl Ascii {
self.chr
}
/// Deprecated: use `as_byte` isntead.
#[deprecated = "use as_byte"]
pub fn to_byte(self) -> u8 {
self.as_byte()
@ -48,6 +50,12 @@ impl Ascii {
self.chr as char
}
/// Deprecated: use `as_char` isntead.
#[deprecated = "use as_char"]
pub fn to_char(self) -> char {
self.as_char()
}
/// Convert to lowercase.
#[inline]
#[stable]

24
src/libstd/path/windows.rs
View File

@ -235,10 +235,10 @@ impl GenericPathUnsafe for Path {
let repr = me.repr.as_slice();
match me.prefix {
Some(DiskPrefix) => {
repr.as_bytes()[0] == path.as_bytes()[0].to_ascii().to_uppercase().to_byte()
repr.as_bytes()[0] == path.as_bytes()[0].to_ascii().to_uppercase().as_byte()
}
Some(VerbatimDiskPrefix) => {
repr.as_bytes()[4] == path.as_bytes()[0].to_ascii().to_uppercase().to_byte()
repr.as_bytes()[4] == path.as_bytes()[0].to_ascii().to_uppercase().as_byte()
}
_ => false
}
@ -673,14 +673,17 @@ impl Path {
match (self.prefix, other.prefix) {
(Some(DiskPrefix), Some(VerbatimDiskPrefix)) => {
self.is_absolute() &&
s_repr.as_bytes()[0].to_ascii().eq_ignore_case(o_repr.as_bytes()[4].to_ascii())
s_repr.as_bytes()[0].to_ascii().to_lowercase() ==
o_repr.as_bytes()[4].to_ascii().to_lowercase()
}
(Some(VerbatimDiskPrefix), Some(DiskPrefix)) => {
other.is_absolute() &&
s_repr.as_bytes()[4].to_ascii().eq_ignore_case(o_repr.as_bytes()[0].to_ascii())
s_repr.as_bytes()[4].to_ascii().to_lowercase() ==
o_repr.as_bytes()[0].to_ascii().to_lowercase()
}
(Some(VerbatimDiskPrefix), Some(VerbatimDiskPrefix)) => {
s_repr.as_bytes()[4].to_ascii().eq_ignore_case(o_repr.as_bytes()[4].to_ascii())
s_repr.as_bytes()[4].to_ascii().to_lowercase() ==
o_repr.as_bytes()[4].to_ascii().to_lowercase()
}
(Some(UNCPrefix(_,_)), Some(VerbatimUNCPrefix(_,_))) => {
s_repr.slice(2, self.prefix_len()) == o_repr.slice(8, other.prefix_len())
@ -747,10 +750,7 @@ impl Path {
let mut s = String::from_str(s.slice_to(len));
unsafe {
let v = s.as_mut_vec();
v[0] = (*v)[0]
.to_ascii()
.to_uppercase()
.to_byte();
v[0] = (*v)[0].to_ascii().to_uppercase().as_byte();
}
if is_abs {
// normalize C:/ to C:\
@ -765,7 +765,7 @@ impl Path {
let mut s = String::from_str(s.slice_to(len));
unsafe {
let v = s.as_mut_vec();
v[4] = (*v)[4].to_ascii().to_uppercase().to_byte();
v[4] = (*v)[4].to_ascii().to_uppercase().as_byte();
}
Some(s)
}
@ -787,13 +787,13 @@ impl Path {
match prefix {
Some(DiskPrefix) => {
s.push(prefix_.as_bytes()[0].to_ascii()
.to_uppercase().to_char());
.to_uppercase().as_char());
s.push(':');
}
Some(VerbatimDiskPrefix) => {
s.push_str(prefix_.slice_to(4));
s.push(prefix_.as_bytes()[4].to_ascii()
.to_uppercase().to_char());
.to_uppercase().as_char());
s.push_str(prefix_.slice_from(5));
}
Some(UNCPrefix(a,b)) => {

5
src/libterm/terminfo/parm.rs
View File

@ -535,9 +535,8 @@ fn format(val: Param, op: FormatOp, flags: Flags) -> Result<Vec<u8> ,String> {
FormatHEX => {
s = s.as_slice()
.to_ascii()
.to_uppercase()
.into_bytes()
.into_iter()
.iter()
.map(|b| b.to_uppercase().as_byte())
.collect();
if flags.alternate {
let s_ = replace(&mut s, vec!(b'0', b'X'));