diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs index 7681792bdf5..3751f8f4dc0 100644 --- a/src/compiletest/errors.rs +++ b/src/compiletest/errors.rs @@ -31,7 +31,7 @@ pub fn load_errors(re: &Regex, testfile: &Path) -> Vec { fn parse_expected(line_num: uint, line: &str, re: &Regex) -> Option { re.captures(line).and_then(|caps| { let adjusts = caps.name("adjusts").len(); - let kind = caps.name("kind").to_ascii().to_lower().into_string(); + let kind = caps.name("kind").to_ascii().to_lowercase().into_string(); let msg = caps.name("msg").trim().to_string(); debug!("line={} kind={} msg={}", line_num, kind, msg); diff --git a/src/librustdoc/html/markdown.rs b/src/librustdoc/html/markdown.rs index a5c6f79ef6b..3f1590773aa 100644 --- a/src/librustdoc/html/markdown.rs +++ b/src/librustdoc/html/markdown.rs @@ -228,7 +228,7 @@ pub fn render(w: &mut fmt::Formatter, s: &str, print_toc: bool) -> fmt::Result { // Transform the contents of the header into a hyphenated string let id = s.as_slice().words().map(|s| { match s.to_ascii_opt() { - Some(s) => s.to_lower().into_string(), + Some(s) => s.to_lowercase().into_string(), None => s.to_string() } }).collect::>().connect("-"); diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs index 71d38ac6659..1c80627d328 100644 --- a/src/libstd/ascii.rs +++ b/src/libstd/ascii.rs @@ -62,8 +62,8 @@ impl Ascii { Ascii{chr: ASCII_LOWER_MAP[self.chr as uint]} } + /// Deprecated: use `to_uppercase` #[inline] - #[allow(missing_doc)] #[deprecated="renamed to `to_uppercase`"] pub fn to_upper(self) -> Ascii { self.to_uppercase() @@ -139,8 +139,8 @@ impl Ascii { (self.chr - 0x20) < 0x5F } + /// Deprecated: use `to_lowercase` #[inline] - #[allow(missing_doc)] #[deprecated="renamed to `is_lowercase`"] pub fn is_lower(&self) -> bool { self.is_lowercase() @@ -319,12 +319,20 @@ pub trait AsciiStr { /// Convert to a string. fn as_str_ascii<'a>(&'a self) -> &'a str; - /// Convert to vector representing a lower cased ascii string. + /// Deprecated: use `to_lowercase` + #[deprecated="renamed `to_lowercase`"] fn to_lower(&self) -> Vec; - /// Convert to vector representing a upper cased ascii string. + /// Convert to vector representing a lower cased ascii string. + fn to_lowercase(&self) -> Vec; + + /// Deprecated: use `to_uppercase` + #[deprecated="renamed `to_uppercase`"] fn to_upper(&self) -> Vec; + /// Convert to vector representing a upper cased ascii string. + fn to_uppercase(&self) -> Vec; + /// Compares two Ascii strings ignoring case. fn eq_ignore_case(self, other: &[Ascii]) -> bool; } @@ -337,11 +345,21 @@ impl<'a> AsciiStr for &'a [Ascii] { #[inline] fn to_lower(&self) -> Vec { + self.to_lowercase() + } + + #[inline] + fn to_lowercase(&self) -> Vec { self.iter().map(|a| a.to_lowercase()).collect() } #[inline] fn to_upper(&self) -> Vec { + self.to_uppercase() + } + + #[inline] + fn to_uppercase(&self) -> Vec { self.iter().map(|a| a.to_uppercase()).collect() } @@ -615,12 +633,13 @@ mod tests { assert_eq!(v.as_slice().to_ascii(), b); assert_eq!("( ;".to_string().as_slice().to_ascii(), b); - assert_eq!("abCDef&?#".to_ascii().to_lower().into_string(), "abcdef&?#".to_string()); - assert_eq!("abCDef&?#".to_ascii().to_upper().into_string(), "ABCDEF&?#".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_lowercase().into_string(), "abcdef&?#".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_uppercase().into_string(), "ABCDEF&?#".to_string()); - assert_eq!("".to_ascii().to_lower().into_string(), "".to_string()); - assert_eq!("YMCA".to_ascii().to_lower().into_string(), "ymca".to_string()); - assert_eq!("abcDEFxyz:.;".to_ascii().to_upper().into_string(), "ABCDEFXYZ:.;".to_string()); + assert_eq!("".to_ascii().to_lowercase().into_string(), "".to_string()); + assert_eq!("YMCA".to_ascii().to_lowercase().into_string(), "ymca".to_string()); + let mixed = "abcDEFxyz:.;".to_ascii(); + assert_eq!(mixed.to_uppercase().into_string(), "ABCDEFXYZ:.;".to_string()); assert!("aBcDeF&?#".to_ascii().eq_ignore_case("AbCdEf&?#".to_ascii())); @@ -632,11 +651,12 @@ mod tests { #[test] fn test_ascii_vec_ng() { - assert_eq!("abCDef&?#".to_ascii().to_lower().into_string(), "abcdef&?#".to_string()); - assert_eq!("abCDef&?#".to_ascii().to_upper().into_string(), "ABCDEF&?#".to_string()); - assert_eq!("".to_ascii().to_lower().into_string(), "".to_string()); - assert_eq!("YMCA".to_ascii().to_lower().into_string(), "ymca".to_string()); - assert_eq!("abcDEFxyz:.;".to_ascii().to_upper().into_string(), "ABCDEFXYZ:.;".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_lowercase().into_string(), "abcdef&?#".to_string()); + assert_eq!("abCDef&?#".to_ascii().to_uppercase().into_string(), "ABCDEF&?#".to_string()); + assert_eq!("".to_ascii().to_lowercase().into_string(), "".to_string()); + assert_eq!("YMCA".to_ascii().to_lowercase().into_string(), "ymca".to_string()); + let mixed = "abcDEFxyz:.;".to_ascii(); + assert_eq!(mixed.to_uppercase().into_string(), "ABCDEFXYZ:.;".to_string()); } #[test] diff --git a/src/libterm/terminfo/parm.rs b/src/libterm/terminfo/parm.rs index a1bce6e8e8b..586f420dc3e 100644 --- a/src/libterm/terminfo/parm.rs +++ b/src/libterm/terminfo/parm.rs @@ -530,7 +530,7 @@ fn format(val: Param, op: FormatOp, flags: Flags) -> Result ,String> { FormatHEX => { s = s.as_slice() .to_ascii() - .to_upper() + .to_uppercase() .into_bytes() .into_iter() .collect(); diff --git a/src/test/bench/shootout-k-nucleotide-pipes.rs b/src/test/bench/shootout-k-nucleotide-pipes.rs index 86c1bd82e9f..1754df9bf44 100644 --- a/src/test/bench/shootout-k-nucleotide-pipes.rs +++ b/src/test/bench/shootout-k-nucleotide-pipes.rs @@ -65,7 +65,7 @@ fn sort_and_fmt(mm: &HashMap , uint>, total: uint) -> String { buffer.push_str(format!("{} {:0.3f}\n", k.as_slice() .to_ascii() - .to_upper() + .to_uppercase() .into_string(), v).as_slice()); } @@ -74,7 +74,7 @@ fn sort_and_fmt(mm: &HashMap , uint>, total: uint) -> String { // given a map, search for the frequency of a pattern fn find(mm: &HashMap , uint>, key: String) -> uint { - let key = key.into_ascii().as_slice().to_lower().into_string(); + let key = key.into_ascii().as_slice().to_lowercase().into_string(); match mm.find_equiv(&key.as_bytes()) { option::None => { return 0u; } option::Some(&num) => { return num; }