Merge pull request #7 from flaviojs/support_more_std_types

Support more std types
tjol · May 31, 2024 · df8ee22 · df8ee22
2 parents b89225e + 72f1a85
commit df8ee22
Show file tree

Hide file tree

Showing 3 changed files with 77 additions and 5 deletions.
diff --git a/src/format.rs b/src/format.rs
@@ -1,4 +1,5 @@
 use std::convert::{TryFrom, TryInto};
+use std::ffi::{CStr, CString};
 
 use crate::{
     parser::{ConversionSpecifier, ConversionType, NumericParam},
@@ -162,7 +163,16 @@ impl Printf for i32 {
 
 impl Printf for u32 {
     fn format(&self, spec: &ConversionSpecifier) -> Result<String> {
-        (*self as u64).format(spec)
+        match spec.conversion_type {
+            ConversionType::Char => {
+                if let Some(c) = char::from_u32(*self) {
+                    c.format(spec)
+                } else {
+                    Err(PrintfError::WrongType)
+                }
+            }
+            _ => (*self as u64).format(spec),
+        }
     }
     fn as_int(&self) -> Option<i32> {
         i32::try_from(*self).ok()
@@ -188,7 +198,16 @@ impl Printf for i16 {
 
 impl Printf for u16 {
     fn format(&self, spec: &ConversionSpecifier) -> Result<String> {
-        (*self as u64).format(spec)
+        match spec.conversion_type {
+            ConversionType::Char => {
+                if let Some(Ok(c)) = char::decode_utf16([*self]).next() {
+                    c.format(spec)
+                } else {
+                    Err(PrintfError::WrongType)
+                }
+            }
+            _ => (*self as u64).format(spec),
+        }
     }
     fn as_int(&self) -> Option<i32> {
         Some(*self as i32)
@@ -204,6 +223,8 @@ impl Printf for i8 {
             ConversionType::HexIntLower | ConversionType::HexIntUpper | ConversionType::OctInt => {
                 (*self as u8).format(spec)
             }
+            // c_char
+            ConversionType::Char => (*self as u8).format(spec),
             _ => Err(PrintfError::WrongType),
         }
     }
@@ -214,7 +235,16 @@ impl Printf for i8 {
 
 impl Printf for u8 {
     fn format(&self, spec: &ConversionSpecifier) -> Result<String> {
-        (*self as u64).format(spec)
+        match spec.conversion_type {
+            ConversionType::Char => {
+                if self.is_ascii() {
+                    char::from(*self).format(spec)
+                } else {
+                    Err(PrintfError::WrongType)
+                }
+            }
+            _ => (*self as u64).format(spec),
+        }
     }
     fn as_int(&self) -> Option<i32> {
         Some(*self as i32)
@@ -475,3 +505,25 @@ impl Printf for String {
         None
     }
 }
+
+impl Printf for &CStr {
+    fn format(&self, spec: &ConversionSpecifier) -> Result<String> {
+        if let Ok(s) = self.to_str() {
+            s.format(spec)
+        } else {
+            Err(PrintfError::WrongType)
+        }
+    }
+    fn as_int(&self) -> Option<i32> {
+        None
+    }
+}
+
+impl Printf for CString {
+    fn format(&self, spec: &ConversionSpecifier) -> Result<String> {
+        self.as_c_str().format(spec)
+    }
+    fn as_int(&self) -> Option<i32> {
+        None
+    }
+}
diff --git a/src/lib.rs b/src/lib.rs
@@ -31,7 +31,7 @@ use parser::{parse_format_string, FormatElement};
 pub use parser::{ConversionSpecifier, ConversionType, NumericParam};
 
 /// Error type
-#[derive(Debug, Clone, Copy, Error)]
+#[derive(Debug, Clone, Copy, Error, PartialEq, Eq)]
 pub enum PrintfError {
     /// Error parsing the format string
     #[error("Error parsing the format string")]

diff --git a/tests/compare_to_libc.rs b/tests/compare_to_libc.rs
@@ -1,7 +1,7 @@
 // The libc crate on Windows doesn't have snprintf
 #![cfg(not(windows))]
 
-use std::convert::TryInto;
+use std::convert::{TryFrom, TryInto};
 use std::ffi::CString;
 use std::os::raw::c_char;
 
@@ -112,4 +112,24 @@ fn test_float() {
 fn test_str() {
     check_fmt_s("test %% with string: %s yay\n", "FOO");
     check_fmt("test char %c", '~');
+    let c_string = CString::new("test").unwrap();
+    check_fmt("%s", c_string.as_c_str());
+    check_fmt("%s", c_string);
+}
+
+#[test]
+fn test_char() {
+    check_fmt("%c", 'x');
+    check_fmt("%c", b'x');
+    check_fmt("%c", b'x' as c_char);
+    check_fmt("%c", u16::try_from('x').unwrap());
+    check_fmt("%c", u32::try_from('x').unwrap());
+}
+
+#[test]
+fn test_sanity() {
+    // u8 must not misinterpret bytes from multi-byte UTF-8 characters
+    let bytes = "∆".as_bytes();
+    assert!(bytes.len() > 1);
+    assert_eq!(sprintf!("%c", bytes[0]), Err(PrintfError::WrongType));
 }