Implement some of AsciiExts methods for AsciiStr directly in no_std mode

tormol · tormol · commit db7baedeb168 · 2016-08-13T17:48:37.000+02:00
The methods implemented are eq_ignore_case(), make_ascii_uppercase() and make_ascii_lowercase().
diff --git a/src/ascii_str.rs b/src/ascii_str.rs
@@ -166,6 +166,26 @@ impl AsciiStr {
                           .rev().take_while(|a| a.is_whitespace() ).count();
         &self[..self.len()-trimmed]
     }
+
+    #[cfg(feature = "no_std")]
+    pub fn eq_ignore_ascii_case(&self, other: &Self) -> bool {
+        self.len() == other.len() &&
+        self.slice.iter().zip(other.slice.iter()).all(|(a, b)| a.eq_ignore_ascii_case(b) )
+    }
+
+    #[cfg(feature = "no_std")]
+    pub fn make_ascii_uppercase(&mut self) {
+        for a in &mut self.slice {
+            *a = a.to_ascii_uppercase();
+        }
+    }
+
+    #[cfg(feature = "no_std")]
+    pub fn make_ascii_lowercase(&mut self) {
+        for a in &mut self.slice {
+            *a = a.to_ascii_lowercase();
+        }
+    }
 }
 
 impl PartialEq<str> for AsciiStr {
@@ -317,7 +337,7 @@ impl AsciiExt for AsciiStr {
 
     fn eq_ignore_ascii_case(&self, other: &Self) -> bool {
         self.len() == other.len() &&
-        self.slice.iter().zip(other.slice.iter()).all(|(a, b)| a.eq_ignore_ascii_case(b))
+        self.slice.iter().zip(other.slice.iter()).all(|(a, b)| a.eq_ignore_ascii_case(b) )
     }
 
     fn make_ascii_uppercase(&mut self) {
@@ -465,9 +485,9 @@ impl AsMutAsciiStr for str {
 #[cfg(test)]
 mod tests {
     use AsciiChar;
-    use super::{AsciiStr, AsAsciiStr, AsAsciiStrError};
+    use super::{AsciiStr, AsAsciiStr, AsMutAsciiStr, AsAsciiStrError};
     #[cfg(not(feature = "no_std"))]
-    use super::AsMutAsciiStr;
+    use std::ascii::AsciiExt;
 
     #[test]
     fn generic_as_ascii_str() {
@@ -521,6 +541,19 @@ mod tests {
         assert_eq!(AsRef::<[u8]>::as_ref(v), b"( ;");
     }
 
+    #[test]
+    fn ascii_case() {
+        let mut bytes = ([b'a',b'@',b'A'], [b'A',b'@',b'a']);
+        let mut a = bytes.0.as_mut_ascii_str().unwrap();
+        let mut b = bytes.1.as_mut_ascii_str().unwrap();
+        assert!(a.eq_ignore_ascii_case(b));
+        assert!(b.eq_ignore_ascii_case(a));
+        a.make_ascii_lowercase();
+        b.make_ascii_uppercase();
+        assert_eq!(a, "a@a");
+        assert_eq!(b, "A@A");
+    }
+
     #[test]
     #[cfg(not(feature = "no_std"))]
     fn fmt_ascii_str() {
