Adapt bench setup to API change

hsivonen · Dec 18, 2024 · 215e492 · 215e492
1 parent b199fe5
commit 215e492
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 20 deletions.
diff --git a/components/normalizer/benches/canonical_decomposition.rs b/components/normalizer/benches/canonical_decomposition.rs
@@ -107,10 +107,10 @@ fn normalizer_bench_data() -> [BenchDataContent; 15] {
     ]
     .map(|(file_name, raw_content)| BenchDataContent {
         file_name: file_name.to_owned(),
-        nfc: nfc_normalizer.normalize(raw_content),
-        nfd: nfd_normalizer.normalize(raw_content),
-        nfkc: nfkc_normalizer.normalize(raw_content),
-        nfkd: nfkd_normalizer.normalize(raw_content),
+        nfc: nfc_normalizer.normalize(raw_content).to_string(),
+        nfd: nfd_normalizer.normalize(raw_content).to_string(),
+        nfkc: nfkc_normalizer.normalize(raw_content).to_string(),
+        nfkd: nfkd_normalizer.normalize(raw_content).to_string(),
     })
 }
 

diff --git a/components/normalizer/benches/composing_normalizer_nfc.rs b/components/normalizer/benches/composing_normalizer_nfc.rs
@@ -115,10 +115,10 @@ fn normalizer_bench_data() -> [BenchDataContent; 15] {
         let nfkd = &nfkd_normalizer.normalize(raw_content);
         BenchDataContent {
             file_name: file_name.to_owned(),
-            nfc: nfc.to_owned(),
-            nfd: nfd.to_owned(),
-            nfkc: nfkc.to_owned(),
-            nfkd: nfkd.to_owned(),
+            nfc: nfc.to_string(),
+            nfd: nfd.to_string(),
+            nfkc: nfkc.to_string(),
+            nfkd: nfkd.to_string(),
             nfc_u16: nfc.encode_utf16().collect(),
             nfd_u16: nfd.encode_utf16().collect(),
             nfkc_u16: nfkc.encode_utf16().collect(),

diff --git a/components/normalizer/benches/composing_normalizer_nfkc.rs b/components/normalizer/benches/composing_normalizer_nfkc.rs
@@ -115,10 +115,10 @@ fn normalizer_bench_data() -> [BenchDataContent; 15] {
         let nfkd = &nfkd_normalizer.normalize(raw_content);
         BenchDataContent {
             file_name: file_name.to_owned(),
-            nfc: nfc.to_owned(),
-            nfd: nfd.to_owned(),
-            nfkc: nfkc.to_owned(),
-            nfkd: nfkd.to_owned(),
+            nfc: nfc.to_string(),
+            nfd: nfd.to_string(),
+            nfkc: nfkc.to_string(),
+            nfkd: nfkd.to_string(),
             nfc_u16: nfc.encode_utf16().collect(),
             nfd_u16: nfd.encode_utf16().collect(),
             nfkc_u16: nfkc.encode_utf16().collect(),

diff --git a/components/normalizer/benches/decomposing_normalizer_nfd.rs b/components/normalizer/benches/decomposing_normalizer_nfd.rs
@@ -115,10 +115,10 @@ fn normalizer_bench_data() -> [BenchDataContent; 15] {
         let nfkd = &nfkd_normalizer.normalize(raw_content);
         BenchDataContent {
             file_name: file_name.to_owned(),
-            nfc: nfc.to_owned(),
-            nfd: nfd.to_owned(),
-            nfkc: nfkc.to_owned(),
-            nfkd: nfkd.to_owned(),
+            nfc: nfc.to_string(),
+            nfd: nfd.to_string(),
+            nfkc: nfkc.to_string(),
+            nfkd: nfkd.to_string(),
             nfc_u16: nfc.encode_utf16().collect(),
             nfd_u16: nfd.encode_utf16().collect(),
             nfkc_u16: nfkc.encode_utf16().collect(),

diff --git a/components/normalizer/benches/decomposing_normalizer_nfkd.rs b/components/normalizer/benches/decomposing_normalizer_nfkd.rs
@@ -115,10 +115,10 @@ fn normalizer_bench_data() -> [BenchDataContent; 15] {
         let nfkd = &nfkd_normalizer.normalize(raw_content);
         BenchDataContent {
             file_name: file_name.to_owned(),
-            nfc: nfc.to_owned(),
-            nfd: nfd.to_owned(),
-            nfkc: nfkc.to_owned(),
-            nfkd: nfkd.to_owned(),
+            nfc: nfc.to_string(),
+            nfd: nfd.to_string(),
+            nfkc: nfkc.to_string(),
+            nfkd: nfkd.to_string(),
             nfc_u16: nfc.encode_utf16().collect(),
             nfd_u16: nfd.encode_utf16().collect(),
             nfkc_u16: nfkc.encode_utf16().collect(),