style: simplify some statements for readability (#563)

* style: simplify some statements for readability

* fix: formatting in `rcdom/` and other directories

Author: hamirmahal

html5ever/benches/html5ever.rs

@@ -49,7 +49,7 @@ fn run_bench(c: &mut Criterion, name: &str) {
         total += sz;
     }
 
-    let test_name = format!("html tokenizing {}", name);
+    let test_name = format!("html tokenizing {name}");
 
     c.bench_function(&test_name, move |b| {
         b.iter(|| {

html5ever/examples/print-tree-actions.rs

@@ -44,7 +44,7 @@ impl TreeSink for Sink {
     }
 
     fn parse_error(&self, msg: Cow<'static, str>) {
-        println!("Parse error: {}", msg);
+        println!("Parse error: {msg}");
     }
 
     fn get_document(&self) -> usize {
@@ -62,7 +62,7 @@ impl TreeSink for Sink {
     }
 
     fn set_quirks_mode(&self, mode: QuirksMode) {
-        println!("Set quirks mode to {:?}", mode);
+        println!("Set quirks mode to {mode:?}");
     }
 
     fn same_node(&self, x: &usize, y: &usize) -> bool {
@@ -77,7 +77,7 @@ impl TreeSink for Sink {
 
     fn create_element(&self, name: QualName, _: Vec<Attribute>, _: ElementFlags) -> usize {
         let id = self.get_id();
-        println!("Created {:?} as {}", name, id);
+        println!("Created {name:?} as {id}");
         // N.B. We intentionally leak memory here to minimize the implementation complexity
         //      of this example code. A real implementation would either want to use a real
         //      real DOM tree implentation, or else use an arena as the backing store for
@@ -101,14 +101,14 @@ impl TreeSink for Sink {
 
     fn append(&self, parent: &usize, child: NodeOrText<usize>) {
         match child {
-            AppendNode(n) => println!("Append node {} to {}", n, parent),
+            AppendNode(n) => println!("Append node {n} to {parent}"),
             AppendText(t) => println!("Append text to {}: \"{}\"", parent, t.escape_default()),
         }
     }
 
     fn append_before_sibling(&self, sibling: &usize, new_node: NodeOrText<usize>) {
         match new_node {
-            AppendNode(n) => println!("Append node {} before {}", n, sibling),
+            AppendNode(n) => println!("Append node {n} before {sibling}"),
             AppendText(t) => println!("Append text before {}: \"{}\"", sibling, t.escape_default()),
         }
     }
@@ -128,12 +128,12 @@ impl TreeSink for Sink {
         public_id: StrTendril,
         system_id: StrTendril,
     ) {
-        println!("Append doctype: {} {} {}", name, public_id, system_id);
+        println!("Append doctype: {name} {public_id} {system_id}");
     }
 
     fn add_attrs_if_missing(&self, target: &usize, attrs: Vec<Attribute>) {
         assert!(self.names.borrow().contains_key(target), "not an element");
-        println!("Add missing attributes to {}:", target);
+        println!("Add missing attributes to {target}:");
         for attr in attrs.into_iter() {
             println!("    {:?} = {}", attr.name, attr.value);
         }
@@ -149,23 +149,23 @@ impl TreeSink for Sink {
     }
 
     fn remove_from_parent(&self, target: &usize) {
-        println!("Remove {} from parent", target);
+        println!("Remove {target} from parent");
     }
 
     fn reparent_children(&self, node: &usize, new_parent: &usize) {
-        println!("Move children from {} to {}", node, new_parent);
+        println!("Move children from {node} to {new_parent}");
     }
 
     fn mark_script_already_started(&self, node: &usize) {
-        println!("Mark script {} as already started", node);
+        println!("Mark script {node} as already started");
     }
 
     fn set_current_line(&self, line_number: u64) {
-        println!("Set current line to {}", line_number);
+        println!("Set current line to {line_number}");
     }
 
     fn pop(&self, elem: &usize) {
-        println!("Popped element {}", elem);
+        println!("Popped element {elem}");
     }
 }
 

html5ever/examples/tokenize.rs

@@ -71,11 +71,11 @@ impl TokenSink for TokenPrinter {
             },
             ParseError(err) => {
                 self.is_char(false);
-                println!("ERROR: {}", err);
+                println!("ERROR: {err}");
             },
             _ => {
                 self.is_char(false);
-                println!("OTHER: {:?}", token);
+                println!("OTHER: {token:?}");
             },
         }
         TokenSinkResult::Continue

html5ever/macros/match_token.rs

@@ -290,10 +290,7 @@ fn expand_match_token_macro(match_token: MatchToken) -> TokenStream {
             // ordinary pattern => expression
             (Lhs::Pattern(pat), Rhs::Expression(expr)) => {
                 if !wildcards_patterns.is_empty() {
-                    panic!(
-                        "ordinary patterns may not appear after wildcard tags {:?} {:?}",
-                        pat, expr
-                    );
+                    panic!("ordinary patterns may not appear after wildcard tags {pat:?} {expr:?}");
                 }
                 arms_code.push(quote!(#binding #pat => #expr,))
             },

html5ever/src/serialize/mod.rs

@@ -109,7 +109,7 @@ impl<Wr: Write> HtmlSerializer<Wr> {
                 '"' 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)),
+                c => self.writer.write_fmt(format_args!("{c}")),
             }?;
         }
         Ok(())

html5ever/src/tokenizer/mod.rs

@@ -273,7 +273,7 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
                 _ => false,
             }
         {
-            let msg = format!("Bad character {}", c);
+            let msg = format!("Bad character {c}");
             self.emit_error(Cow::Owned(msg));
         }
 
@@ -1483,11 +1483,11 @@ impl<Sink: TokenSink> Tokenizer<Sink> {
             "\n{:12}         total in token sink",
             self.time_in_sink.get()
         );
-        println!("\n{:12}         total in tokenizer", total);
+        println!("\n{total:12}         total in tokenizer");
 
         for (k, v) in results.into_iter() {
             let pct = 100.0 * (v as f64) / (total as f64);
-            println!("{:12}  {:4.1}%  {:?}", v, pct, k);
+            println!("{v:12}  {pct:4.1}%  {k:?}");
         }
     }
 

html5ever/src/tree_builder/mod.rs

@@ -296,7 +296,7 @@ where
 
     #[allow(dead_code)]
     fn dump_state(&self, label: String) {
-        println!("dump_state on {}", label);
+        println!("dump_state on {label}");
         print!("    open_elems:");
         for node in self.open_elems.borrow().iter() {
             let name = self.sink.elem_name(node);

html5ever/src/util/str.rs

@@ -11,7 +11,7 @@ use std::fmt;
 
 pub(crate) fn to_escaped_string<T: fmt::Debug>(x: &T) -> String {
     // FIXME: don't allocate twice
-    let string = format!("{:?}", x);
+    let string = format!("{x:?}");
     string.chars().flat_map(|c| c.escape_default()).collect()
 }
 

markup5ever/build.rs

@@ -73,12 +73,7 @@ fn main() {
     )
     .unwrap();
     for &(prefix, url) in NAMESPACES {
-        writeln!(
-            generated,
-            "({}) => {{ namespace_url!({:?}) }};",
-            prefix, url
-        )
-        .unwrap();
+        writeln!(generated, "({prefix}) => {{ namespace_url!({url:?}) }};").unwrap();
     }
     writeln!(generated, "}}").unwrap();
 }
@@ -102,7 +97,7 @@ fn named_entities_to_phf(to: &Path) {
 
     let mut phf_map = phf_codegen::Map::new();
     for (key, value) in entities {
-        phf_map.entry(key, &format!("{:?}", value));
+        phf_map.entry(key, &format!("{value:?}"));
     }
 
     let mut file = File::create(to).unwrap();

rcdom/examples/hello_xml.rs

@@ -33,5 +33,5 @@ fn main() {
         xml.push_str(&contents.borrow());
     }
 
-    println!("{:?} {:?}!", hello_tag, xml);
+    println!("{hello_tag:?} {xml:?}!");
 }