Address code complaints

1. Change String builder with `format!` macro
2. Replace parameter passing with just setting tokenization options to `Default`

Author: Ygg01

html5ever/benches/html5ever.rs

@@ -24,7 +24,7 @@ impl TokenSink for Sink {
 }
 
 
-fn run_bench(c: &mut Criterion, name: &str, opts: TokenizerOpts) {
+fn run_bench(c: &mut Criterion, name: &str) {
     let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     path.push("data/bench/");
     path.push(name);
@@ -49,13 +49,10 @@ fn run_bench(c: &mut Criterion, name: &str, opts: TokenizerOpts) {
         total += sz;
     }
 
-    let mut test_name = String::new();
-    test_name.push_str("tokenizing");
-    test_name.push_str(" ");
-    test_name.push_str(name);
+    let test_name = format!("html tokenizing {}", name);
 
     c.bench_function(&test_name, move |b| b.iter(|| {
-        let mut tok = Tokenizer::new(Sink, opts.clone());
+        let mut tok = Tokenizer::new(Sink, Default::default());
         let mut buffer = BufferQueue::new();
         // We are doing clone inside the bench function, this is not ideal, but possibly
         // necessary since our iterator consumes the underlying buffer.
@@ -71,12 +68,12 @@ fn run_bench(c: &mut Criterion, name: &str, opts: TokenizerOpts) {
 
 
 fn html5ever_benchmark(c: &mut Criterion) {
-    run_bench(c, "lipsum.html", Default::default());
-    run_bench(c, "lipsum-zh.html", Default::default());
-    run_bench(c, "medium-fragment.html", Default::default());
-    run_bench(c, "small-fragment.html", Default::default());
-    run_bench(c, "tiny-fragment.html", Default::default());
-    run_bench(c, "strong.html", Default::default());
+    run_bench(c, "lipsum.html");
+    run_bench(c, "lipsum-zh.html");
+    run_bench(c, "medium-fragment.html");
+    run_bench(c, "small-fragment.html");
+    run_bench(c, "tiny-fragment.html");
+    run_bench(c, "strong.html");
 }
 
 criterion_group!(benches, html5ever_benchmark);

xml5ever/benches/xml5ever.rs

@@ -23,7 +23,7 @@ impl TokenSink for Sink {
 }
 
 
-fn run_bench(c: &mut Criterion, name: &str, opts: XmlTokenizerOpts) {
+fn run_bench(c: &mut Criterion, name: &str) {
     let mut path = PathBuf::from(env!("CARGO_MANIFEST_DIR"));
     path.push("data/bench/");
     path.push(name);
@@ -48,13 +48,10 @@ fn run_bench(c: &mut Criterion, name: &str, opts: XmlTokenizerOpts) {
         total += sz;
     }
 
-    let mut test_name = String::new();
-    test_name.push_str("tokenizing");
-    test_name.push_str(" ");
-    test_name.push_str(name);
+    let test_name = format!("xml tokenizing {}", name);
 
     c.bench_function(&test_name, move |b| b.iter(|| {
-        let mut tok = XmlTokenizer::new(Sink, opts.clone());
+        let mut tok = XmlTokenizer::new(Sink, Default::default());
         let mut buffer = BufferQueue::new();
         // We are doing clone inside the bench function, this is not ideal, but possibly
         // necessary since our iterator consumes the underlying buffer.
@@ -70,7 +67,7 @@ fn run_bench(c: &mut Criterion, name: &str, opts: XmlTokenizerOpts) {
 
 
 fn xml5ever_benchmarks(c: &mut Criterion) {
-    run_bench(c, "strong.xml", Default::default());
+    run_bench(c, "strong.xml");
 }
 
 criterion_group!(benches, xml5ever_benchmarks);