update

Author: bcmyers

num-format-windows/Cargo.toml

@@ -21,5 +21,4 @@ maintenance = { status = "actively-developed" }
 travis-ci = { repository = "bcmyers/num-format", branch = "master" }
 
 [build-dependencies]
-cfg-if = "0.1"
 bindgen = "0.47"

num-format-windows/build.rs

@@ -1,16 +1,12 @@
-#[macro_use]
-extern crate cfg_if;
-
-cfg_if! {
-    if #[cfg(windows)] {
+#[cfg(windows)]
 fn main() {
     use std::env;
     use std::path::Path;
 
     use bindgen::{Builder, RustTarget};
 
     let root = env::var("CARGO_MANIFEST_DIR").unwrap();
-    let headers_path = Path::new(&root).join("win.h");
+    let headers_path = Path::new(&root).join("wrapper.h");
     let headers = headers_path.to_str().unwrap();
 
     let bindings = Builder::default()
@@ -30,20 +26,11 @@ fn main() {
         .generate()
         .expect("unable to generate bindings for windows.h");
 
-    let out_path = Path::new(&env::var("OUT_DIR").unwrap()).join("windows.rs");
+    let out_path = Path::new(&env::var("OUT_DIR").unwrap()).join("bindings.rs");
     bindings
         .write_to_file(&out_path)
         .expect("unable to write bindings for windows.h");
-
-    let development_dir = Path::new(&root).parent().unwrap().join("tmp");
-    if development_dir.exists() {
-        let out_path = development_dir.join("windows.rs");
-        bindings
-            .write_to_file(&out_path)
-            .expect("unable to write bindings for windows.h");
-    }
-}
-    } else {
-        fn main() {}
-    }
 }
+
+#[cfg(not(windows))]
+fn main() {}

num-format-windows/src/lib.rs

@@ -3,4 +3,4 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 #![allow(non_upper_case_globals)]
-include!(concat!(env!("OUT_DIR"), "\\windows.rs"));
+include!(concat!(env!("OUT_DIR"), "\\bindings.rs"));

num-format-windows/win.h num-format-windows/wrapper.h

@@ -5,7 +5,8 @@ use core::ops::Deref;
 use core::str;
 
 use crate::constants::MAX_BUF_LEN;
-use crate::{Format, ToFormattedStr};
+use crate::format::Format;
+use crate::to_formatted_str::ToFormattedStr;
 
 /// <b><u>A key type</u></b>. Represents a stack-allocated buffer you can use to get a
 /// formatted `&str` without heap allocation.
@@ -84,6 +85,20 @@ impl Buffer {
     pub(crate) fn as_mut_ptr(&mut self) -> *mut u8 {
         self.inner.as_mut_ptr()
     }
+
+    #[inline(always)]
+    pub(crate) fn write_with_itoa<N: itoa::Integer>(&mut self, n: N) -> usize {
+        let mut itoa_buf = itoa::Buffer::new();
+        let s = itoa_buf.format(n);
+        let bytes = s.as_bytes();
+        let len = s.len();
+        for i in 0..len {
+            self.inner[i] = bytes[i];
+        }
+        self.pos = 0;
+        self.end = len;
+        len
+    }
 }
 
 impl AsRef<str> for Buffer {

num-format/src/buffer.rs

@@ -94,7 +94,6 @@ impl Error {
     where
         S: AsRef<str>,
     {
-        eprintln!("{}", msg.as_ref());
         unimplemented!()
     }
 }

num-format/src/error.rs

@@ -1,8 +1,6 @@
 use core::mem;
 use core::ptr;
 
-use itoa;
-
 use crate::constants::{MAX_BUF_LEN, TABLE};
 use crate::helpers::{self, Separator};
 use crate::sealed::Sealed;
@@ -28,10 +26,7 @@ macro_rules! impl_signed {
                 // Bail out early if we can just use itoa
                 // (i.e. if we don't have a separator and a minus sign doesn't cause us problems)
                 if sep.is_none() && ((is_negative && min == "-") || !is_negative) {
-                    let c = itoa::write(&mut buf.inner[..], *self).unwrap();
-                    buf.pos = 0;
-                    buf.end = c;
-                    return c;
+                    return buf.write_with_itoa(*self);
                 }
 
                 // Reset our position to the end of the buffer

num-format/src/impls/int.rs

@@ -1,8 +1,6 @@
 use core::mem;
 use core::num::{NonZeroU128, NonZeroU16, NonZeroU32, NonZeroU64, NonZeroU8, NonZeroUsize};
 
-use itoa;
-
 use crate::constants::{MAX_BUF_LEN, TABLE};
 use crate::helpers::{self, Separator};
 use crate::sealed::Sealed;
@@ -15,10 +13,7 @@ impl ToFormattedStr for NonZeroU8 {
     where
         F: Format,
     {
-        let c = itoa::write(&mut buf.inner[..], self.get()).unwrap();
-        buf.pos = 0;
-        buf.end = c;
-        c
+        buf.write_with_itoa(self.get())
     }
 }
 
@@ -40,10 +35,7 @@ macro_rules! impl_non_zero {
                 // Bail out early if we can just use itoa
                 // (i.e. if we don't have a separator)
                 if sep.is_none() {
-                    let c = itoa::write(&mut buf.inner[..], self.get()).unwrap();
-                    buf.pos = 0;
-                    buf.end = c;
-                    return c;
+                    return buf.write_with_itoa(self.get());
                 }
 
                 // Reset our position to the end of the buffer

num-format/src/impls/non_zero_uint.rs

@@ -1,7 +1,5 @@
 use core::mem;
 
-use itoa;
-
 use crate::constants::{MAX_BUF_LEN, TABLE};
 use crate::helpers::{self, Separator};
 use crate::sealed::Sealed;
@@ -14,10 +12,7 @@ impl ToFormattedStr for u8 {
     where
         F: Format,
     {
-        let c = itoa::write(&mut buf.inner[..], *self).unwrap();
-        buf.pos = 0;
-        buf.end = c;
-        c
+        buf.write_with_itoa(*self)
     }
 }
 
@@ -39,10 +34,7 @@ macro_rules! impl_unsigned {
                 // Bail out early if we can just use itoa
                 // (i.e. if we don't have a separator)
                 if sep.is_none() {
-                    let c = itoa::write(&mut buf.inner[..], *self).unwrap();
-                    buf.pos = 0;
-                    buf.end = c;
-                    return c;
+                    return buf.write_with_itoa(*self);
                 }
 
                 // Reset our position to the end of the buffer