From 7349b15ab827836412e907c9274653ec8e716c5b Mon Sep 17 00:00:00 2001
From: Wilson Lin <code@wilsonl.in>
Date: Sun, 29 Dec 2019 21:53:49 +1100
Subject: [PATCH] Reformatting

---
 src/main.rs                  | 2 +-
 src/pattern.rs               | 1 +
 src/spec/tag/content.rs      | 2 +-
 src/spec/tag/contentfirst.rs | 2 +-
 src/spec/tag/formatting.rs   | 2 +-
 src/spec/tag/layout.rs       | 2 +-
 src/spec/tag/void.rs         | 2 +-
 src/spec/tag/wss.rs          | 2 +-
 src/unit/bang.rs             | 2 +-
 src/unit/comment.rs          | 2 +-
 src/unit/content.rs          | 2 +-
 src/unit/entity.rs           | 5 +++--
 src/unit/script/js.rs        | 4 ++--
 src/unit/script/text.rs      | 2 +-
 src/unit/style.rs            | 2 +-
 src/unit/tag.rs              | 9 +++++----
 16 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index 063ee06..c8e0b96 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,5 +1,5 @@
 use std::fs::File;
-use std::io::{Read, Write, stderr};
+use std::io::{Read, stderr, Write};
 
 use structopt::StructOpt;
 
diff --git a/src/pattern.rs b/src/pattern.rs
index 764408d..6e22dbb 100644
--- a/src/pattern.rs
+++ b/src/pattern.rs
@@ -1,4 +1,5 @@
 use phf::Map;
+
 use crate::proc::Processor;
 
 pub struct SinglePattern {
diff --git a/src/spec/tag/content.rs b/src/spec/tag/content.rs
index 90c35fb..caeae98 100644
--- a/src/spec/tag/content.rs
+++ b/src/spec/tag/content.rs
@@ -1,4 +1,4 @@
-use ::phf::{phf_set, Set};
+use phf::{phf_set, Set};
 
 pub static CONTENT_TAGS: Set<&'static [u8]> = phf_set! {
 	b"address",
diff --git a/src/spec/tag/contentfirst.rs b/src/spec/tag/contentfirst.rs
index 1d9ed4f..9db55d1 100644
--- a/src/spec/tag/contentfirst.rs
+++ b/src/spec/tag/contentfirst.rs
@@ -1,4 +1,4 @@
-use ::phf::{phf_set, Set};
+use phf::{phf_set, Set};
 
 pub static CONTENT_FIRST_TAGS: Set<&'static [u8]> = phf_set! {
 	b"dd",
diff --git a/src/spec/tag/formatting.rs b/src/spec/tag/formatting.rs
index f65c023..4ac2ca2 100644
--- a/src/spec/tag/formatting.rs
+++ b/src/spec/tag/formatting.rs
@@ -1,4 +1,4 @@
-use ::phf::{phf_set, Set};
+use phf::{phf_set, Set};
 
 // Sourced from https://developer.mozilla.org/en-US/docs/Web/HTML/Element#Inline_text_semantics.
 // Differences to tags listed in table at above URL: -br, +del, +ins.
diff --git a/src/spec/tag/layout.rs b/src/spec/tag/layout.rs
index 80bfd4a..a9b9a49 100644
--- a/src/spec/tag/layout.rs
+++ b/src/spec/tag/layout.rs
@@ -1,4 +1,4 @@
-use ::phf::{phf_set, Set};
+use phf::{phf_set, Set};
 
 pub static LAYOUT_TAGS: Set<&'static [u8]> = phf_set! {
 	b"article",
diff --git a/src/spec/tag/void.rs b/src/spec/tag/void.rs
index ea87640..68b0b7c 100644
--- a/src/spec/tag/void.rs
+++ b/src/spec/tag/void.rs
@@ -1,4 +1,4 @@
-use ::phf::{phf_set, Set};
+use phf::{phf_set, Set};
 
 pub static VOID_TAGS: Set<&'static [u8]> = phf_set! {
 	b"area",
diff --git a/src/spec/tag/wss.rs b/src/spec/tag/wss.rs
index 90a434f..8470522 100644
--- a/src/spec/tag/wss.rs
+++ b/src/spec/tag/wss.rs
@@ -1,4 +1,4 @@
-use ::phf::{phf_set, Set};
+use phf::{phf_set, Set};
 
 // "WSS" stands for whitespace-sensitive.
 pub static WSS_TAGS: Set<&'static [u8]> = phf_set! {
diff --git a/src/unit/bang.rs b/src/unit/bang.rs
index dc98eff..6f8523d 100644
--- a/src/unit/bang.rs
+++ b/src/unit/bang.rs
@@ -1,5 +1,5 @@
-use crate::proc::Processor;
 use crate::err::ProcessingResult;
+use crate::proc::Processor;
 
 pub fn process_bang(proc: &mut Processor) -> ProcessingResult<()> {
     chain!(proc.match_seq(b"<!").require()?.keep());
diff --git a/src/unit/comment.rs b/src/unit/comment.rs
index 2fd873f..fb21b7f 100644
--- a/src/unit/comment.rs
+++ b/src/unit/comment.rs
@@ -1,6 +1,6 @@
-use crate::proc::Processor;
 use crate::err::ProcessingResult;
 use crate::pattern;
+use crate::proc::Processor;
 
 pub fn process_comment(proc: &mut Processor) -> ProcessingResult<()> {
     chain!(proc.match_seq(b"<!--").expect().discard());
diff --git a/src/unit/content.rs b/src/unit/content.rs
index 3f36343..81be8f2 100644
--- a/src/unit/content.rs
+++ b/src/unit/content.rs
@@ -2,13 +2,13 @@ use crate::err::ProcessingResult;
 use crate::proc::{Checkpoint, Processor, ProcessorRange};
 use crate::spec::codepoint::is_whitespace;
 use crate::spec::tag::content::CONTENT_TAGS;
+use crate::spec::tag::contentfirst::CONTENT_FIRST_TAGS;
 use crate::spec::tag::formatting::FORMATTING_TAGS;
 use crate::spec::tag::wss::WSS_TAGS;
 use crate::unit::bang::process_bang;
 use crate::unit::comment::process_comment;
 use crate::unit::entity::{EntityType, parse_entity};
 use crate::unit::tag::process_tag;
-use crate::spec::tag::contentfirst::CONTENT_FIRST_TAGS;
 
 #[derive(Copy, Clone, PartialEq, Eq, Debug)]
 enum ContentType {
diff --git a/src/unit/entity.rs b/src/unit/entity.rs
index 902961f..ebacd66 100644
--- a/src/unit/entity.rs
+++ b/src/unit/entity.rs
@@ -1,8 +1,9 @@
+use phf::phf_map;
+
 use crate::err::ProcessingResult;
+use crate::pattern::TrieNode;
 use crate::proc::{Processor, ProcessorRange};
 use crate::spec::codepoint::{is_digit, is_hex_digit, is_lower_hex_digit, is_upper_hex_digit};
-use phf::phf_map;
-use crate::pattern::TrieNode;
 
 // The minimum length of any entity is 3, which is a character entity reference
 // with a single character name. The longest UTF-8 representation of a Unicode
diff --git a/src/unit/script/js.rs b/src/unit/script/js.rs
index ee051e6..fff718e 100644
--- a/src/unit/script/js.rs
+++ b/src/unit/script/js.rs
@@ -1,5 +1,5 @@
-use crate::err::{ProcessingResult, ErrorType};
-use crate::proc::{Processor};
+use crate::err::{ErrorType, ProcessingResult};
+use crate::proc::Processor;
 
 fn is_string_delimiter(c: u8) -> bool {
     c == b'"' || c == b'\''
diff --git a/src/unit/script/text.rs b/src/unit/script/text.rs
index 621b507..59087b0 100644
--- a/src/unit/script/text.rs
+++ b/src/unit/script/text.rs
@@ -1,5 +1,5 @@
-use crate::proc::Processor;
 use crate::err::ProcessingResult;
+use crate::proc::Processor;
 
 pub fn process_text_script(proc: &mut Processor) -> ProcessingResult<()> {
     // NOTE: See "notes/Text script content.md".
diff --git a/src/unit/style.rs b/src/unit/style.rs
index 70e4f6d..5cc039f 100644
--- a/src/unit/style.rs
+++ b/src/unit/style.rs
@@ -1,5 +1,5 @@
+use crate::err::{ErrorType, ProcessingResult};
 use crate::proc::Processor;
-use crate::err::{ProcessingResult, ErrorType};
 
 fn is_string_delimiter(c: u8) -> bool {
     match c {
diff --git a/src/unit/tag.rs b/src/unit/tag.rs
index 37414a7..8f8a46b 100644
--- a/src/unit/tag.rs
+++ b/src/unit/tag.rs
@@ -1,13 +1,14 @@
+use phf::{phf_set, Set};
+
 use crate::err::{ErrorType, ProcessingResult};
 use crate::proc::{Processor, ProcessorRange};
 use crate::spec::codepoint::{is_alphanumeric, is_whitespace};
 use crate::spec::tag::void::VOID_TAGS;
 use crate::unit::attr::{AttrType, process_attr, ProcessedAttr};
 use crate::unit::content::process_content;
-use crate::unit::style::process_style;
-use phf::{Set, phf_set};
-use crate::unit::script::text::process_text_script;
 use crate::unit::script::js::process_js_script;
+use crate::unit::script::text::process_text_script;
+use crate::unit::style::process_style;
 
 pub static JAVASCRIPT_MIME_TYPES: Set<&'static [u8]> = phf_set! {
     b"application/ecmascript",
@@ -89,7 +90,7 @@ pub fn process_tag(proc: &mut Processor) -> ProcessingResult<()> {
         let ProcessedAttr { name, typ, value } = process_attr(proc)?;
         match &proc[name] {
             b"type" => attr_type_value = value,
-            _ => {},
+            _ => {}
         };
         last_attr_type = Some(typ);
     };