Fix issues in markup5ever

- After enabling ALL tests there were some issues
- Also using `$ crate` instead `::markup5ever`
- Removed unused crate

Author: Ygg01

markup5ever/Cargo.toml

@@ -25,5 +25,4 @@ heapsize_derive = { version = "0.1", optional = true }
 string_cache_codegen = "0.4"
 phf_codegen = "0.7.3"
 rustc-serialize = "0.3.15"
-syn = { version = "0.11", features = ["full", "visit"] }
 

markup5ever/build.rs

@@ -10,7 +10,6 @@
 extern crate string_cache_codegen;
 extern crate phf_codegen;
 extern crate rustc_serialize;
-extern crate syn;
 
 use rustc_serialize::json::{Json, Decoder};
 use rustc_serialize::Decodable;

markup5ever/interface/mod.rs

@@ -91,7 +91,7 @@ impl QualName {
         QualName {
             ns: ns!(),
             local: local,
-            prefix: Some(prefix),            
+            prefix: Some(prefix),
         }
     }
 }
@@ -129,14 +129,14 @@ mod tests {
     #[test]
     fn qualname() {
         assert_eq!(QualName::new(ns!(), local_name!("")),
-                   QualName { ns: ns!(), local: LocalName::from("") });
+                   QualName { ns: ns!(), local: LocalName::from(""), prefix: None });
         assert_eq!(QualName::new(ns!(xml), local_name!("base")),
-                   QualName { ns: ns!(xml), local: local_name!("base") });
+                   QualName { ns: ns!(xml), local: local_name!("base"), prefix: None });
     }
 
     #[test]
     fn qualname_macro() {
-        assert_eq!(qualname!("", ""), QualName { ns: ns!(), local: local_name!("") });
-        assert_eq!(qualname!(xml, "base"), QualName { ns: ns!(xml), local: local_name!("base") });
+        assert_eq!(qualname!("", ""), QualName { ns: ns!(), local: local_name!(""), prefix: None });
+        assert_eq!(qualname!(xml, "base"), QualName { ns: ns!(xml), local: local_name!("base"), prefix: None });
     }
 }

markup5ever/lib.rs

@@ -17,30 +17,110 @@ extern crate tendril;
 #[macro_export]
 macro_rules! qualname {
     ("", $local:tt) => {
-        ::markup5ever::QualName {
+        $ crate::QualName {
             ns: ns!(),
             prefix: None,
             local: local_name!($local),
         }
     };
     ($ns:tt, $local:tt) => {
-        ::markup5ever::QualName {
+        $ crate::QualName {
             ns: ns!($ns),
             prefix: None,
             local: local_name!($local),
         }
     }
 }
 
+#[macro_export]
+macro_rules! small_char_set ( ($($e:expr)+) => (
+    $ crate ::SmallCharSet {
+        bits: $( (1 << ($e as usize)) )|+
+    }
+));
+
 include!(concat!(env!("OUT_DIR"), "/generated.rs"));
 
 
 pub mod data;
 pub mod interface;
 pub mod util {
-    pub mod buffer_queue;
     pub mod smallcharset;
+    pub mod buffer_queue;
+    
 }
 
 pub use interface::{QualName, Attribute};
 pub use util::smallcharset::SmallCharSet;
+
+
+
+#[cfg(test)]
+#[allow(non_snake_case)]
+mod test {
+    use std::ascii::AsciiExt;
+    use tendril::SliceExt;
+
+    use super::{QualName};
+    use super::util::buffer_queue::{BufferQueue, FromSet, NotFromSet};
+
+
+
+    #[test]
+    fn smoke_test() {
+        let mut bq = BufferQueue::new();
+        assert_eq!(bq.peek(), None);
+        assert_eq!(bq.next(), None);
+
+        bq.push_back("abc".to_tendril());
+        assert_eq!(bq.peek(), Some('a'));
+        assert_eq!(bq.next(), Some('a'));
+        assert_eq!(bq.peek(), Some('b'));
+        assert_eq!(bq.peek(), Some('b'));
+        assert_eq!(bq.next(), Some('b'));
+        assert_eq!(bq.peek(), Some('c'));
+        assert_eq!(bq.next(), Some('c'));
+        assert_eq!(bq.peek(), None);
+        assert_eq!(bq.next(), None);
+    }
+
+    #[test]
+    fn can_unconsume() {
+        let mut bq = BufferQueue::new();
+        bq.push_back("abc".to_tendril());
+        assert_eq!(bq.next(), Some('a'));
+
+        bq.push_front("xy".to_tendril());
+        assert_eq!(bq.next(), Some('x'));
+        assert_eq!(bq.next(), Some('y'));
+        assert_eq!(bq.next(), Some('b'));
+        assert_eq!(bq.next(), Some('c'));
+        assert_eq!(bq.next(), None);
+    }
+
+    #[test]
+    fn can_pop_except_set() {
+        let mut bq = BufferQueue::new();
+        bq.push_back("abc&def".to_tendril());
+        let mut pop = || bq.pop_except_from(small_char_set!('&'));
+        assert_eq!(pop(), Some(NotFromSet("abc".to_tendril())));
+        assert_eq!(pop(), Some(FromSet('&')));
+        assert_eq!(pop(), Some(NotFromSet("def".to_tendril())));
+        assert_eq!(pop(), None);
+    }
+
+    #[test]
+    fn can_eat() {
+        // This is not very comprehensive.  We rely on the tokenizer
+        // integration tests for more thorough testing with many
+        // different input buffer splits.
+        let mut bq = BufferQueue::new();
+        bq.push_back("a".to_tendril());
+        bq.push_back("bc".to_tendril());
+        assert_eq!(bq.eat("abcd", u8::eq_ignore_ascii_case), None);
+        assert_eq!(bq.eat("ax", u8::eq_ignore_ascii_case), Some(false));
+        assert_eq!(bq.eat("ab", u8::eq_ignore_ascii_case), Some(true));
+        assert_eq!(bq.next(), Some('c'));
+        assert_eq!(bq.next(), None);
+    }
+}

markup5ever/util/buffer_queue.rs

@@ -161,69 +161,3 @@ impl BufferQueue {
         Some(true)
     }
 }
-
-#[cfg(test)]
-#[allow(non_snake_case)]
-mod test {
-    use std::ascii::AsciiExt;
-    use tendril::SliceExt;
-    use super::{BufferQueue, FromSet, NotFromSet};
-
-    #[test]
-    fn smoke_test() {
-        let mut bq = BufferQueue::new();
-        assert_eq!(bq.peek(), None);
-        assert_eq!(bq.next(), None);
-
-        bq.push_back("abc".to_tendril());
-        assert_eq!(bq.peek(), Some('a'));
-        assert_eq!(bq.next(), Some('a'));
-        assert_eq!(bq.peek(), Some('b'));
-        assert_eq!(bq.peek(), Some('b'));
-        assert_eq!(bq.next(), Some('b'));
-        assert_eq!(bq.peek(), Some('c'));
-        assert_eq!(bq.next(), Some('c'));
-        assert_eq!(bq.peek(), None);
-        assert_eq!(bq.next(), None);
-    }
-
-    #[test]
-    fn can_unconsume() {
-        let mut bq = BufferQueue::new();
-        bq.push_back("abc".to_tendril());
-        assert_eq!(bq.next(), Some('a'));
-
-        bq.push_front("xy".to_tendril());
-        assert_eq!(bq.next(), Some('x'));
-        assert_eq!(bq.next(), Some('y'));
-        assert_eq!(bq.next(), Some('b'));
-        assert_eq!(bq.next(), Some('c'));
-        assert_eq!(bq.next(), None);
-    }
-
-    #[test]
-    fn can_pop_except_set() {
-        let mut bq = BufferQueue::new();
-        bq.push_back("abc&def".to_tendril());
-        let mut pop = || bq.pop_except_from(small_char_set!('&'));
-        assert_eq!(pop(), Some(NotFromSet("abc".to_tendril())));
-        assert_eq!(pop(), Some(FromSet('&')));
-        assert_eq!(pop(), Some(NotFromSet("def".to_tendril())));
-        assert_eq!(pop(), None);
-    }
-
-    #[test]
-    fn can_eat() {
-        // This is not very comprehensive.  We rely on the tokenizer
-        // integration tests for more thorough testing with many
-        // different input buffer splits.
-        let mut bq = BufferQueue::new();
-        bq.push_back("a".to_tendril());
-        bq.push_back("bc".to_tendril());
-        assert_eq!(bq.eat("abcd", u8::eq_ignore_ascii_case), None);
-        assert_eq!(bq.eat("ax", u8::eq_ignore_ascii_case), Some(false));
-        assert_eq!(bq.eat("ab", u8::eq_ignore_ascii_case), Some(true));
-        assert_eq!(bq.next(), Some('c'));
-        assert_eq!(bq.next(), None);
-    }
-}

markup5ever/util/smallcharset.rs

@@ -7,12 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_export]
-macro_rules! small_char_set ( ($($e:expr)+) => (
-    ::markup5ever::SmallCharSet {
-        bits: $( (1 << ($e as usize)) )|+
-    }
-));
+
 
 /// Represents a set of "small characters", those with Unicode scalar
 /// values less than 64.