Start no_std

Author: Mesoptier

Cargo.toml

@@ -22,18 +22,21 @@ encoding_rs = "0.8"
 [dependencies]
 cssparser-macros = {path = "./macros", version = "0.6"}
 dtoa-short = "0.3"
-itoa = "0.4"
+itoa = { version = "0.4", default-features = false }
 matches = "0.1"
 phf = {version = "0.8", features = ["macros"]}
 serde = {version = "1.0", optional = true}
 smallvec = "1.0"
+no-std-compat = { version = "0.2.0", features = ["alloc"] }
 
 [build-dependencies]
 syn = { version = "1", features = ["extra-traits", "fold", "full"] }
 quote = "1"
 proc-macro2 = "1"
 
 [features]
+default = []
+std = ["no-std-compat/std", "itoa/std"]
 bench = []
 dummy_match_byte = []
 

src/color.rs

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use std::prelude::v1::*;
+
 use std::f32::consts::PI;
 use std::fmt;
 

src/cow_rc_str.rs

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use std::prelude::v1::*;
+
 use std::borrow::{Borrow, Cow};
 use std::cmp;
 use std::fmt;

src/lib.rs

@@ -67,6 +67,9 @@ fn parse_border_spacing(_context: &ParserContext, input: &mut Parser)
 
 #![recursion_limit = "200"] // For color::parse_color_keyword
 
+#![cfg_attr(not(feature = "std"), no_std)]
+extern crate no_std_compat as std;
+
 pub use crate::color::{
     parse_color_keyword, AngleOrNumber, Color, ColorComponentParser, NumberOrPercentage, RGBA,
 };

src/parser.rs

@@ -2,6 +2,8 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use std::prelude::v1::*;
+
 use crate::cow_rc_str::CowRcStr;
 use crate::tokenizer::{SourceLocation, SourcePosition, Token, Tokenizer};
 use smallvec::SmallVec;

src/serializer.rs

@@ -2,11 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+use std::prelude::v1::*;
+
 use dtoa_short::{self, Notation};
 use itoa;
 use matches::matches;
 use std::fmt::{self, Write};
-use std::io;
 use std::str;
 
 use super::Token;
@@ -340,34 +341,7 @@ macro_rules! impl_tocss_for_int {
             where
                 W: fmt::Write,
             {
-                struct AssumeUtf8<W: fmt::Write>(W);
-
-                impl<W: fmt::Write> io::Write for AssumeUtf8<W> {
-                    #[inline]
-                    fn write_all(&mut self, buf: &[u8]) -> io::Result<()> {
-                        // Safety: itoa only emits ASCII, which is also well-formed UTF-8.
-                        debug_assert!(buf.is_ascii());
-                        self.0
-                            .write_str(unsafe { str::from_utf8_unchecked(buf) })
-                            .map_err(|_| io::ErrorKind::Other.into())
-                    }
-
-                    #[inline]
-                    fn write(&mut self, buf: &[u8]) -> io::Result<usize> {
-                        self.write_all(buf)?;
-                        Ok(buf.len())
-                    }
-
-                    #[inline]
-                    fn flush(&mut self) -> io::Result<()> {
-                        Ok(())
-                    }
-                }
-
-                match itoa::write(AssumeUtf8(dest), *self) {
-                    Ok(_) => Ok(()),
-                    Err(_) => Err(fmt::Error),
-                }
+                itoa::fmt(dest, *self).map(|_| ())
             }
         }
     };

src/tests.rs

@@ -5,6 +5,8 @@
 #[cfg(feature = "bench")]
 extern crate test;
 
+use std::prelude::v1::*;
+
 use encoding_rs;
 use matches::matches;
 use serde_json::{self, json, Map, Value};
@@ -66,14 +68,14 @@ fn normalize(json: &mut Value) {
 fn assert_json_eq(results: Value, mut expected: Value, message: &str) {
     normalize(&mut expected);
     if !almost_equals(&results, &expected) {
-        println!(
-            "{}",
-            ::difference::Changeset::new(
-                &serde_json::to_string_pretty(&results).unwrap(),
-                &serde_json::to_string_pretty(&expected).unwrap(),
-                "\n",
-            )
-        );
+//        println!(
+//            "{}",
+//            ::difference::Changeset::new(
+//                &serde_json::to_string_pretty(&results).unwrap(),
+//                &serde_json::to_string_pretty(&expected).unwrap(),
+//                "\n",
+//            )
+//        );
         panic!("{}", message)
     }
 }
@@ -282,7 +284,7 @@ fn outer_block_end_consumed() {
             .expect_function_matching("calc")
             .map_err(Into::<ParseError<()>>::into))
         .is_ok());
-    println!("{:?}", input.position());
+//    println!("{:?}", input.position());
     assert!(input.next().is_err());
 }
 

src/tokenizer.rs

@@ -4,6 +4,8 @@
 
 // https://drafts.csswg.org/css-syntax/#tokenization
 
+use std::prelude::v1::*;
+
 use self::Token::*;
 use crate::cow_rc_str::CowRcStr;
 use crate::parser::ParserState;