Fix fmt and clippy errors (#571)

* Enable "full" feature for syn

This feature was previously required to compile,
but not specified. That worked because some other
dependency enabled it, but we must not rely on that.

Signed-off-by: Simon Wülker <[email protected]>

* cargo clippy --fix

Signed-off-by: Simon Wülker <[email protected]>

* cargo fmt

Signed-off-by: Simon Wülker <[email protected]>

* Fix resolver declaration

The key is workspace.resolver, so declaring
the resolver under workspace.dependencies.resolver
is wrong.

Signed-off-by: Simon Wülker <[email protected]>

---------

Signed-off-by: Simon Wülker <[email protected]>

Author: simonwuelker

Cargo.toml

@@ -7,7 +7,8 @@ members = [
     "match_token"
 ]
 
+resolver = "2"
+
 [workspace.dependencies]
 match_token = { path = "match_token" }
 
-resolver = "2"

html5ever/src/tree_builder/mod.rs

@@ -1392,11 +1392,12 @@ where
         // template start tag's shadowrootmode is not in the none state
         let is_shadow_root_mode = tag.attrs.iter().any(|attr| {
             attr.name.local == local_name!("shadowrootmode")
-            && (attr.value.to_string() == String::from("open") || attr.value.to_string() == String::from("close"))
+                && (attr.value.to_string() == *"open" || attr.value.to_string() == *"close")
         });
 
         // Check if intended_parent's document allows declarative shadow roots
-        let allow_declarative_shadow_roots = self.sink.allow_declarative_shadow_roots(&intended_parent);
+        let allow_declarative_shadow_roots =
+            self.sink.allow_declarative_shadow_roots(&intended_parent);
 
         // the adjusted current node is not the topmost element in the stack of open elements
         let adjusted_current_node_not_topmost = match self.open_elems.borrow().first() {
@@ -1412,11 +1413,12 @@ where
             None => true,
         };
 
-        return is_shadow_root_mode && allow_declarative_shadow_roots && adjusted_current_node_not_topmost;
+        is_shadow_root_mode && allow_declarative_shadow_roots && adjusted_current_node_not_topmost
     }
 
     fn attach_declarative_shadow(&self, tag: &Tag) -> Result<(), String> {
-        self.sink.attach_declarative_shadow(self.open_elems.borrow().last().unwrap(), tag.attrs.clone())
+        self.sink
+            .attach_declarative_shadow(self.open_elems.borrow().last().unwrap(), tag.attrs.clone())
     }
 
     fn create_formatting_element_for(&self, tag: Tag) -> Handle {

html5ever/src/tree_builder/rules.rs

@@ -160,7 +160,7 @@ where
                     self.template_modes.borrow_mut().push(InTemplate);
 
                     if (self.should_attach_declarative_shadow(&tag)) {
-                        if let Err(_) = self.attach_declarative_shadow(&tag) {
+                        if self.attach_declarative_shadow(&tag).is_err() {
                             // TODO:
                             // insert at the adjusted insertion location
                             // with the result of insert a foreign element for template tag

markup5ever/entities.rs

@@ -1,4 +1,4 @@
-pub const NAMED_ENTITIES: [(&str, u32, u32); 2231] = [
+pub static NAMED_ENTITIES: [(&str, u32, u32); 2231] = [
     ("Á", 193, 0),
     ("&Aacute", 193, 0),
     ("á", 225, 0),

markup5ever/interface/tree_builder.rs

@@ -262,7 +262,7 @@ pub trait TreeSink {
     }
 
     fn allow_declarative_shadow_roots(&self, _intended_parent: &Self::Handle) -> bool {
-        return true;
+        true
     }
 
     /// Attach declarative shadow
@@ -271,7 +271,9 @@ pub trait TreeSink {
         _location: &Self::Handle,
         _attrs: Vec<Attribute>,
     ) -> Result<(), String> {
-        Err(String::from("No implementation for attach_declarative_shadow"))
+        Err(String::from(
+            "No implementation for attach_declarative_shadow",
+        ))
     }
 }
 

match_token/Cargo.toml

@@ -4,9 +4,9 @@ version = "0.1.0"
 edition = "2021"
 
 [dependencies]
-syn = "2"
+syn = { version = "2", features = ["full"] }
 quote = "1"
 proc-macro2 = "1"
 
 [lib]
-proc-macro = true
+proc-macro = true