auto merge of #14401 : aochagavia/rust/pr4, r=alexcrichton

Some functions implemented for the Ascii struct have the same functionality as other functions implemented for the normal chars. For consistency, I think they should have the same name, so I renamed the functions in Ascii to match the names in the Char trait.

* Renamed `to_lower` to `to_lowercase`
* Renamed `to_upper` to `to_uppercase`
* Renamed `is_alpha` to `is_alphabetic`
* Renamed `is_alnum` to `is_alphanumeric`
* Renamed `is_lower` to `is_lowercase`
* Renamed `is_upper` to `is_uppercase`

[breaking-change]

diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index c591c477563ee6e5f59f64c60e26120b5e540a27..def8db6077986f4fa41bdd49fcef4044bb3b9758 100644 (file)
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -819,7 +819,7 @@ fn to_lower( s : &str ) -> StrBuf {
         let i = s.chars();
         let c : Vec<char> = i.map( |c| {
             if c.is_ascii() {
-                c.to_ascii().to_lower().to_char()
+                c.to_ascii().to_lowercase().to_char()
             } else {
                 c
             }

diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs
index 07b76afe2ad827429f7eec37ffeeafc1308bebef..5832fd9a400903aae747b2990295347629eb1ddc 100644 (file)
--- a/src/libglob/lib.rs
+++ b/src/libglob/lib.rs
@@ -553,18 +553,18 @@ fn in_char_specifiers(specifiers: &[CharSpecifier], c: char, options: MatchOptio
                 // FIXME: work with non-ascii chars properly (issue #1347)
                 if !options.case_sensitive && c.is_ascii() && start.is_ascii() && end.is_ascii() {
 
-                    let start = start.to_ascii().to_lower();
-                    let end = end.to_ascii().to_lower();
+                    let start = start.to_ascii().to_lowercase();
+                    let end = end.to_ascii().to_lowercase();
 
-                    let start_up = start.to_upper();
-                    let end_up = end.to_upper();
+                    let start_up = start.to_uppercase();
+                    let end_up = end.to_uppercase();
 
                     // only allow case insensitive matching when
                     // both start and end are within a-z or A-Z
                     if start != start_up && end != end_up {
                         let start = start.to_char();
                         let end = end.to_char();
-                        let c = c.to_ascii().to_lower().to_char();
+                        let c = c.to_ascii().to_lowercase().to_char();
                         if c >= start && c <= end {
                             return true;
                         }

diff --git a/src/libstd/ascii.rs b/src/libstd/ascii.rs
index e5689158601bc8cd8fcb0357c145dc2280c011a4..83667fb518135180a6eca0c1f329234063b62e5e 100644 (file)
--- a/src/libstd/ascii.rs
+++ b/src/libstd/ascii.rs
@@ -39,15 +39,29 @@ pub fn to_char(self) -> char {
         self.chr as char
     }
 
-    /// Convert to lowercase.
     #[inline]
+    #[allow(missing_doc)]
+    #[deprecated="renamed to `to_lowercase`"]
     pub fn to_lower(self) -> Ascii {
+        self.to_lowercase()
+    }
+
+    /// Convert to lowercase.
+    #[inline]
+    pub fn to_lowercase(self) -> Ascii {
         Ascii{chr: ASCII_LOWER_MAP[self.chr as uint]}
     }
 
-    /// Convert to uppercase.
     #[inline]
+    #[allow(missing_doc)]
+    #[deprecated="renamed to `to_uppercase`"]
     pub fn to_upper(self) -> Ascii {
+        self.to_uppercase()
+    }
+
+    /// Convert to uppercase.
+    #[inline]
+    pub fn to_uppercase(self) -> Ascii {
         Ascii{chr: ASCII_UPPER_MAP[self.chr as uint]}
     }
 
@@ -59,9 +73,16 @@ pub fn eq_ignore_case(self, other: Ascii) -> bool {
 
     // the following methods are like ctype, and the implementation is inspired by musl
 
-    /// Check if the character is a letter (a-z, A-Z)
     #[inline]
+    #[allow(missing_doc)]
+    #[deprecated="renamed to `is_alphabetic`"]
     pub fn is_alpha(&self) -> bool {
+        self.is_alphabetic()
+    }
+
+    /// Check if the character is a letter (a-z, A-Z)
+    #[inline]
+    pub fn is_alphabetic(&self) -> bool {
         (self.chr >= 0x41 && self.chr <= 0x5A) || (self.chr >= 0x61 && self.chr <= 0x7A)
     }
 
@@ -71,9 +92,16 @@ pub fn is_digit(&self) -> bool {
         self.chr >= 0x30 && self.chr <= 0x39
     }
 
-    /// Check if the character is a letter or number
     #[inline]
+    #[allow(missing_doc)]
+    #[deprecated="renamed to `is_alphanumeric`"]
     pub fn is_alnum(&self) -> bool {
+        self.is_alphanumeric()
+    }
+
+    /// Check if the character is a letter or number
+    #[inline]
+    pub fn is_alphanumeric(&self) -> bool {
         self.is_alpha() || self.is_digit()
     }
 
@@ -101,15 +129,29 @@ pub fn is_print(&self) -> bool {
         (self.chr - 0x20) < 0x5F
     }
 
-    /// Checks if the character is lowercase
     #[inline]
+    #[allow(missing_doc)]
+    #[deprecated="renamed to `is_lowercase`"]
     pub fn is_lower(&self) -> bool {
+        self.is_lowercase()
+    }
+
+    /// Checks if the character is lowercase
+    #[inline]
+    pub fn is_lowercase(&self) -> bool {
         (self.chr - 'a' as u8) < 26
     }
 
-    /// Checks if the character is uppercase
     #[inline]
+    #[allow(missing_doc)]
+    #[deprecated="renamed to `is_uppercase`"]
     pub fn is_upper(&self) -> bool {
+        self.is_uppercase()
+    }
+
+    /// Checks if the character is uppercase
+    #[inline]
+    pub fn is_uppercase(&self) -> bool {
         (self.chr - 'A' as u8) < 26
     }