Update to 2018 edition and remove all warnings.

Author: jdm

html5ever/Cargo.toml

@@ -9,6 +9,7 @@ description = "High-performance browser-grade HTML5 parser"
 documentation = "https://docs.rs/html5ever"
 build = "build.rs"
 categories = [ "parser-implementations", "web-programming" ]
+edition = "2018"
 
 [lib]
 name = "html5ever"

html5ever/build.rs

@@ -7,12 +7,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[macro_use]
-extern crate quote;
-#[macro_use]
-extern crate syn;
-extern crate proc_macro2;
-
 use std::env;
 use std::path::Path;
 use std::thread::Builder;

html5ever/macros/match_token.rs

@@ -99,6 +99,9 @@ matching, by enforcing the following restrictions on its input:
     is common in the HTML5 syntax.
 */
 
+use quote::quote;
+use syn::{braced, parse_quote, Token};
+
 use proc_macro2::TokenStream;
 use quote::ToTokens;
 use std::collections::HashSet;
@@ -447,8 +450,8 @@ impl Fold for MatchTokenParser {
 
 fn make_tag_pattern(binding: &TokenStream, tag: Tag) -> TokenStream {
     let kind = match tag.kind {
-        TagKind::StartTag => quote!(::tokenizer::StartTag),
-        TagKind::EndTag => quote!(::tokenizer::EndTag),
+        TagKind::StartTag => quote!(crate::tokenizer::StartTag),
+        TagKind::EndTag => quote!(crate::tokenizer::EndTag),
     };
     let name_field = if let Some(name) = tag.name {
         let name = name.to_string();
@@ -457,6 +460,6 @@ fn make_tag_pattern(binding: &TokenStream, tag: Tag) -> TokenStream {
         quote!()
     };
     quote! {
-        ::tree_builder::types::TagToken(#binding ::tokenizer::Tag { kind: #kind, #name_field .. })
+        crate::tree_builder::types::TagToken(#binding crate::tokenizer::Tag { kind: #kind, #name_field .. })
     }
 }

html5ever/src/driver.rs

@@ -9,16 +9,16 @@
 
 //! High-level interface to the parser.
 
-use buffer_queue::BufferQueue;
-use tokenizer::{Tokenizer, TokenizerOpts, TokenizerResult};
-use tree_builder::{create_element, TreeBuilder, TreeBuilderOpts, TreeSink};
-use {Attribute, QualName};
+use crate::buffer_queue::BufferQueue;
+use crate::tokenizer::{Tokenizer, TokenizerOpts, TokenizerResult};
+use crate::tree_builder::{create_element, TreeBuilder, TreeBuilderOpts, TreeSink};
+use crate::{Attribute, QualName};
 
 use std::borrow::Cow;
 
-use tendril;
-use tendril::stream::{TendrilSink, Utf8LossyDecoder};
-use tendril::StrTendril;
+use crate::tendril;
+use crate::tendril::stream::{TendrilSink, Utf8LossyDecoder};
+use crate::tendril::StrTendril;
 
 /// All-encompassing options struct for the parser.
 #[derive(Clone, Default)]

html5ever/src/lib.rs

@@ -12,13 +12,6 @@
 #![cfg_attr(test, deny(warnings))]
 #![allow(unused_parens)]
 
-#[macro_use]
-extern crate log;
-#[macro_use]
-extern crate markup5ever;
-#[macro_use]
-extern crate mac;
-
 pub use driver::{parse_document, parse_fragment, ParseOpts, Parser};
 pub use markup5ever::*;
 

html5ever/src/serialize/mod.rs

@@ -7,11 +7,13 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use log::warn;
 pub use markup5ever::serialize::{AttrRef, Serialize, Serializer, TraversalScope};
+use markup5ever::{local_name, namespace_url, ns};
 use std::default::Default;
 use std::io::{self, Write};
 
-use {LocalName, QualName};
+use crate::{LocalName, QualName};
 
 pub fn serialize<Wr, T>(writer: Wr, node: &T, opts: SerializeOpts) -> io::Result<()>
 where
@@ -104,14 +106,14 @@ impl<Wr: Write> HtmlSerializer<Wr> {
 
     fn write_escaped(&mut self, text: &str, attr_mode: bool) -> io::Result<()> {
         for c in text.chars() {
-            try!(match c {
+            match c {
                 '&' => self.writer.write_all(b"&amp;"),
                 '\u{00A0}' => self.writer.write_all(b"&nbsp;"),
                 '"' if attr_mode => self.writer.write_all(b"&quot;"),
                 '<' if !attr_mode => self.writer.write_all(b"&lt;"),
                 '>' if !attr_mode => self.writer.write_all(b"&gt;"),
                 c => self.writer.write_fmt(format_args!("{}", c)),
-            });
+            }?;
         }
         Ok(())
     }
@@ -136,33 +138,33 @@ impl<Wr: Write> Serializer for HtmlSerializer<Wr> {
             return Ok(());
         }
 
-        try!(self.writer.write_all(b"<"));
-        try!(self.writer.write_all(tagname(&name).as_bytes()));
+        self.writer.write_all(b"<")?;
+        self.writer.write_all(tagname(&name).as_bytes())?;
         for (name, value) in attrs {
-            try!(self.writer.write_all(b" "));
+            self.writer.write_all(b" ")?;
 
             match name.ns {
                 ns!() => (),
-                ns!(xml) => try!(self.writer.write_all(b"xml:")),
+                ns!(xml) => self.writer.write_all(b"xml:")?,
                 ns!(xmlns) => {
                     if name.local != local_name!("xmlns") {
-                        try!(self.writer.write_all(b"xmlns:"));
+                        self.writer.write_all(b"xmlns:")?;
                     }
                 },
-                ns!(xlink) => try!(self.writer.write_all(b"xlink:")),
+                ns!(xlink) => self.writer.write_all(b"xlink:")?,
                 ref ns => {
                     // FIXME(#122)
                     warn!("attr with weird namespace {:?}", ns);
-                    try!(self.writer.write_all(b"unknown_namespace:"));
+                    self.writer.write_all(b"unknown_namespace:")?;
                 },
             }
 
-            try!(self.writer.write_all(name.local.as_bytes()));
-            try!(self.writer.write_all(b"=\""));
-            try!(self.write_escaped(value, true));
-            try!(self.writer.write_all(b"\""));
+            self.writer.write_all(name.local.as_bytes())?;
+            self.writer.write_all(b"=\"")?;
+            self.write_escaped(value, true)?;
+            self.writer.write_all(b"\"")?;
         }
-        try!(self.writer.write_all(b">"));
+        self.writer.write_all(b">")?;
 
         let ignore_children = name.ns == ns!(html) &&
             match name.local {
@@ -211,8 +213,8 @@ impl<Wr: Write> Serializer for HtmlSerializer<Wr> {
             return Ok(());
         }
 
-        try!(self.writer.write_all(b"</"));
-        try!(self.writer.write_all(tagname(&name).as_bytes()));
+        self.writer.write_all(b"</")?;
+        self.writer.write_all(tagname(&name).as_bytes())?;
         self.writer.write_all(b">")
     }
 
@@ -239,22 +241,22 @@ impl<Wr: Write> Serializer for HtmlSerializer<Wr> {
     }
 
     fn write_comment(&mut self, text: &str) -> io::Result<()> {
-        try!(self.writer.write_all(b"<!--"));
-        try!(self.writer.write_all(text.as_bytes()));
+        self.writer.write_all(b"<!--")?;
+        self.writer.write_all(text.as_bytes())?;
         self.writer.write_all(b"-->")
     }
 
     fn write_doctype(&mut self, name: &str) -> io::Result<()> {
-        try!(self.writer.write_all(b"<!DOCTYPE "));
-        try!(self.writer.write_all(name.as_bytes()));
+        self.writer.write_all(b"<!DOCTYPE ")?;
+        self.writer.write_all(name.as_bytes())?;
         self.writer.write_all(b">")
     }
 
     fn write_processing_instruction(&mut self, target: &str, data: &str) -> io::Result<()> {
-        try!(self.writer.write_all(b"<?"));
-        try!(self.writer.write_all(target.as_bytes()));
-        try!(self.writer.write_all(b" "));
-        try!(self.writer.write_all(data.as_bytes()));
+        self.writer.write_all(b"<?")?;
+        self.writer.write_all(target.as_bytes())?;
+        self.writer.write_all(b" ")?;
+        self.writer.write_all(data.as_bytes())?;
         self.writer.write_all(b">")
     }
 }

html5ever/src/tokenizer/char_ref/mod.rs

@@ -8,11 +8,13 @@
 // except according to those terms.
 
 use super::{TokenSink, Tokenizer};
-use buffer_queue::BufferQueue;
-use data;
-use tendril::StrTendril;
-use util::str::is_ascii_alnum;
+use crate::buffer_queue::BufferQueue;
+use crate::data;
+use crate::tendril::StrTendril;
+use crate::util::str::is_ascii_alnum;
 
+use log::debug;
+use mac::format_if;
 use std::borrow::Cow::Borrowed;
 use std::char::from_u32;
 

html5ever/src/tokenizer/interface.rs

@@ -7,11 +7,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use interface::Attribute;
+use crate::interface::Attribute;
 use std::borrow::Cow;
-use tendril::StrTendril;
-use tokenizer::states;
-use LocalName;
+use crate::tendril::StrTendril;
+use crate::tokenizer::states;
+use crate::LocalName;
 
 pub use self::TagKind::{EndTag, StartTag};
 pub use self::Token::{CharacterTokens, CommentToken, DoctypeToken, TagToken};

html5ever/src/tokenizer/mod.rs

@@ -21,16 +21,19 @@ use self::states::{Rawtext, Rcdata, ScriptData, ScriptDataEscaped};
 
 use self::char_ref::{CharRef, CharRefTokenizer};
 
-use util::str::lower_ascii_letter;
+use crate::util::str::lower_ascii_letter;
 
+use log::debug;
+use mac::{format_if, matches, _tt_as_expr_hack};
+use markup5ever::{namespace_url, ns, small_char_set};
 use std::borrow::Cow::{self, Borrowed};
 use std::collections::BTreeMap;
 use std::default::Default;
 use std::mem::replace;
 
-pub use buffer_queue::{BufferQueue, FromSet, NotFromSet, SetResult};
-use tendril::StrTendril;
-use {Attribute, LocalName, QualName, SmallCharSet};
+pub use crate::buffer_queue::{BufferQueue, FromSet, NotFromSet, SetResult};
+use crate::tendril::StrTendril;
+use crate::{Attribute, LocalName, QualName, SmallCharSet};
 
 mod char_ref;
 mod interface;

html5ever/src/tree_builder/data.rs

@@ -7,9 +7,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use interface::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
-use tendril::StrTendril;
-use tokenizer::Doctype;
+use crate::interface::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
+use crate::tendril::StrTendril;
+use crate::tokenizer::Doctype;
 
 // These should all be lowercase, for ASCII-case-insensitive matching.
 static QUIRKY_PUBLIC_PREFIXES: &'static [&'static str] = &[

html5ever/src/tree_builder/mod.rs

@@ -11,20 +11,20 @@
 
 //! The HTML5 tree builder.
 
-pub use interface::{create_element, ElementFlags, NextParserState, Tracer, TreeSink};
-pub use interface::{AppendNode, AppendText, Attribute, NodeOrText};
-pub use interface::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
+pub use crate::interface::{create_element, ElementFlags, NextParserState, Tracer, TreeSink};
+pub use crate::interface::{AppendNode, AppendText, Attribute, NodeOrText};
+pub use crate::interface::{LimitedQuirks, NoQuirks, Quirks, QuirksMode};
 
 use self::types::*;
 
-use tendril::StrTendril;
-use {ExpandedName, LocalName, Namespace, QualName};
+use crate::tendril::StrTendril;
+use crate::{ExpandedName, LocalName, Namespace, QualName};
 
-use tokenizer;
-use tokenizer::states as tok_state;
-use tokenizer::{Doctype, EndTag, StartTag, Tag, TokenSink, TokenSinkResult};
+use crate::tokenizer;
+use crate::tokenizer::states as tok_state;
+use crate::tokenizer::{Doctype, EndTag, StartTag, Tag, TokenSink, TokenSinkResult};
 
-use util::str::is_ascii_whitespace;
+use crate::util::str::is_ascii_whitespace;
 
 use std::borrow::Cow::Borrowed;
 use std::collections::VecDeque;
@@ -33,11 +33,12 @@ use std::iter::{Enumerate, Rev};
 use std::mem::replace;
 use std::{fmt, slice};
 
-use log::Level;
-use tokenizer::states::{RawData, RawKind};
-use tree_builder::tag_sets::*;
-use tree_builder::types::*;
-use util::str::to_escaped_string;
+use log::{Level, debug, log_enabled, warn};
+use mac::{format_if, matches, _tt_as_expr_hack};
+use crate::tokenizer::states::{RawData, RawKind};
+use crate::tree_builder::tag_sets::*;
+use crate::tree_builder::types::*;
+use crate::util::str::to_escaped_string;
 
 pub use self::PushFlag::*;
 

html5ever/src/tree_builder/rules.rs

@@ -9,13 +9,14 @@
 
 // The tree builder rules, as a single, enormous nested match expression.
 
-use tokenizer::states::{Plaintext, Rawtext, Rcdata, ScriptData};
-use tree_builder::tag_sets::*;
-use tree_builder::types::*;
+use markup5ever::{expanded_name, local_name, namespace_prefix, namespace_url, ns};
+use crate::tokenizer::states::{Plaintext, Rawtext, Rcdata, ScriptData};
+use crate::tree_builder::tag_sets::*;
+use crate::tree_builder::types::*;
 
 use std::borrow::ToOwned;
 
-use tendril::SliceExt;
+use crate::tendril::SliceExt;
 
 fn any_not_whitespace(x: &StrTendril) -> bool {
     // FIXME: this might be much faster as a byte scan

html5ever/src/tree_builder/tag_sets.rs

@@ -9,7 +9,9 @@
 
 //! Various sets of HTML tag names, and macros for declaring them.
 
-use ExpandedName;
+use crate::ExpandedName;
+use mac::*;
+use markup5ever::{expanded_name, local_name, namespace_prefix, namespace_url, ns};
 
 macro_rules! declare_tag_set_impl ( ($param:ident, $b:ident, $supr:ident, $($tag:tt)+) => (
     match $param {
@@ -31,13 +33,13 @@ macro_rules! declare_tag_set_body (
 
 macro_rules! declare_tag_set (
     (pub $name:ident = $($toks:tt)+) => (
-        pub fn $name(p: ::ExpandedName) -> bool {
+        pub fn $name(p: crate::ExpandedName) -> bool {
             declare_tag_set_body!(p = $($toks)+)
         }
     );
 
     ($name:ident = $($toks:tt)+) => (
-        fn $name(p: ::ExpandedName) -> bool {
+        fn $name(p: crate::ExpandedName) -> bool {
             declare_tag_set_body!(p = $($toks)+)
         }
     );

html5ever/src/tree_builder/types.rs

@@ -9,10 +9,10 @@
 
 //! Types used within the tree builder code.  Not exported to users.
 
-use tokenizer::states::RawKind;
-use tokenizer::Tag;
+use crate::tokenizer::states::RawKind;
+use crate::tokenizer::Tag;
 
-use tendril::StrTendril;
+use crate::tendril::StrTendril;
 
 pub use self::FormatEntry::*;
 pub use self::InsertionMode::*;

html5ever/src/util/str.rs

@@ -7,6 +7,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use mac::*;
 use std::fmt;
 
 pub fn to_escaped_string<T: fmt::Debug>(x: &T) -> String {