fix: replace source should hash inner source (#60)

* fix: replace source should hash inner source * fix test --------- Co-authored-by: ahabhgk <[email protected]>
web-infra-dev · Jun 12, 2023 · c417331 · c417331 · github-actions · Jun 12, 2023
1 parent 81ee4e2
commit c417331
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/replace_source.rs b/src/replace_source.rs
@@ -547,8 +547,9 @@ impl<T: Hash> Hash for ReplaceSource<T> {
     self.sort_replacement();
     "ReplaceSource".hash(state);
     for repl in self.replacements.lock().iter() {
-      repl.hash(state)
+      repl.hash(state);
     }
+    self.inner.hash(state);
   }
 }
 
@@ -962,7 +963,7 @@ return <div>{data.foo}</div>
     assert_eq!(source.map(&MapOptions::default()), None);
     let mut hasher = twox_hash::XxHash64::default();
     source.hash(&mut hasher);
-    assert_eq!(format!("{:x}", hasher.finish()), "ab891b4c45dc95b4");
+    assert_eq!(format!("{:x}", hasher.finish()), "e9877250d7449bc5");
   }
 
   #[test]

diff --git a/src/source.rs b/src/source.rs
@@ -532,7 +532,7 @@ mod tests {
     RawSource::from("g").boxed().hash(&mut state);
     (&RawSource::from("h") as &dyn Source).hash(&mut state);
     ReplaceSource::new(RawSource::from("i").boxed()).hash(&mut state);
-    assert_eq!(format!("{:x}", state.finish()), "940ec870b6ce313a");
+    assert_eq!(format!("{:x}", state.finish()), "fb814b430ddd31e0");
   }
 
   #[test]
Benchmark suite	Current: `c417331`	Previous: `fbbc1c2`	Ratio
`benchmark_concat_generate_base64`	`28553` ns/iter (`± 184`)	`23621` ns/iter (`± 274`)	`1.21`
`benchmark_concat_generate_base64_with_cache`	`18136` ns/iter (`± 118`)	`15088` ns/iter (`± 72`)	`1.20`
`benchmark_concat_generate_string`	`14390` ns/iter (`± 92`)	`11898` ns/iter (`± 145`)	`1.21`
`benchmark_concat_generate_string_with_cache`	`4079` ns/iter (`± 69`)	`3382` ns/iter (`± 15`)	`1.21`