Skip to content

Commit

Permalink
fix(testing): Fix path normalization on windows for testing diffs (#7299
Browse files Browse the repository at this point in the history 
)
  • Loading branch information
@ForsakenHarmony
ForsakenHarmony committed Apr 19, 2023
1 parent ffa7689 commit 3422923
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions crates/testing/src/output.rs
View file
Expand Up @@ -53,14 +53,13 @@ impl fmt::Debug for NormalizedOutput {
}

fn normalize_input(input: String, skip_last_newline: bool) -> String {
let manifest_dirs = vec![
let manifest_dirs = [
adjust_canonicalization(paths::manifest_dir()),
paths::manifest_dir().to_string_lossy().to_string(),
adjust_canonicalization(paths::manifest_dir()).replace('\\', "\\\\"),
paths::manifest_dir()
.to_string_lossy()
.replace('\\', "\\\\"),
];
]
.into_iter()
.flat_map(|dir| [dir.replace('\\', "\\\\"), dir.replace('\\', "/"), dir])
.collect::<Vec<_>>();

let input = input.replace("\r\n", "\n");

Expand Down

1 comment on commit 3422923

@github-actions
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Benchmark

Benchmark suite Current: 3422923 Previous: 39d415c Ratio
es/full/bugs-1 303187 ns/iter (± 8667) 290561 ns/iter (± 17090) 1.04
es/full/minify/libraries/antd 1608291285 ns/iter (± 52909956) 1653350086 ns/iter (± 22251595) 0.97
es/full/minify/libraries/d3 317895333 ns/iter (± 12092345) 303484061 ns/iter (± 6012696) 1.05
es/full/minify/libraries/echarts 1273962310 ns/iter (± 35471393) 1262108777 ns/iter (± 21320882) 1.01
es/full/minify/libraries/jquery 91713391 ns/iter (± 1503289) 92204146 ns/iter (± 1052055) 0.99
es/full/minify/libraries/lodash 112840676 ns/iter (± 2366124) 106394718 ns/iter (± 984068) 1.06
es/full/minify/libraries/moment 55273660 ns/iter (± 784190) 53163255 ns/iter (± 1058457) 1.04
es/full/minify/libraries/react 20425176 ns/iter (± 262342) 18980655 ns/iter (± 184763) 1.08
es/full/minify/libraries/terser 271151878 ns/iter (± 2422393) 247340005 ns/iter (± 1867761) 1.10
es/full/minify/libraries/three 490973467 ns/iter (± 7178538) 443321195 ns/iter (± 5199983) 1.11
es/full/minify/libraries/typescript 3150042911 ns/iter (± 48521066) 3088876706 ns/iter (± 23273494) 1.02
es/full/minify/libraries/victory 736633934 ns/iter (± 5724318) 666529264 ns/iter (± 12745258) 1.11
es/full/minify/libraries/vue 139456520 ns/iter (± 3229984) 130939980 ns/iter (± 2575153) 1.07
es/full/codegen/es3 28864 ns/iter (± 95) 28755 ns/iter (± 288) 1.00
es/full/codegen/es5 28970 ns/iter (± 95) 28827 ns/iter (± 72) 1.00
es/full/codegen/es2015 29035 ns/iter (± 48) 28821 ns/iter (± 76) 1.01
es/full/codegen/es2016 29015 ns/iter (± 54) 28823 ns/iter (± 72) 1.01
es/full/codegen/es2017 28979 ns/iter (± 60) 28823 ns/iter (± 61) 1.01
es/full/codegen/es2018 29035 ns/iter (± 52) 28803 ns/iter (± 176) 1.01
es/full/codegen/es2019 29024 ns/iter (± 60) 28852 ns/iter (± 68) 1.01
es/full/codegen/es2020 29010 ns/iter (± 39) 28768 ns/iter (± 65) 1.01
es/full/all/es3 184102171 ns/iter (± 6194660) 181158433 ns/iter (± 3220738) 1.02
es/full/all/es5 176833402 ns/iter (± 2309510) 172978569 ns/iter (± 2175031) 1.02
es/full/all/es2015 135209962 ns/iter (± 4188882) 136785817 ns/iter (± 3400750) 0.99
es/full/all/es2016 134702566 ns/iter (± 2851893) 134753421 ns/iter (± 1745254) 1.00
es/full/all/es2017 132007196 ns/iter (± 1568018) 133540066 ns/iter (± 1383570) 0.99
es/full/all/es2018 129742407 ns/iter (± 2707685) 128181598 ns/iter (± 1179806) 1.01
es/full/all/es2019 125904932 ns/iter (± 4055720) 127843833 ns/iter (± 3472607) 0.98
es/full/all/es2020 118993039 ns/iter (± 1320991) 120544297 ns/iter (± 1953925) 0.99
es/full/parser 516465 ns/iter (± 10371) 521263 ns/iter (± 10232) 0.99
es/full/base/fixer 24064 ns/iter (± 59) 22289 ns/iter (± 15) 1.08
es/full/base/resolver_and_hygiene 85764 ns/iter (± 101) 87534 ns/iter (± 65) 0.98
serialization of serde 122 ns/iter (± 0) 121 ns/iter (± 0) 1.01
css/minify/libraries/bootstrap 29302848 ns/iter (± 126414) 28245344 ns/iter (± 265422) 1.04
css/visitor/compare/clone 2140809 ns/iter (± 22571) 2165755 ns/iter (± 21852) 0.99
css/visitor/compare/visit_mut_span 2328728 ns/iter (± 8865) 2337620 ns/iter (± 15708) 1.00
css/visitor/compare/visit_mut_span_panic 2387876 ns/iter (± 33572) 2397478 ns/iter (± 9588) 1.00
css/visitor/compare/fold_span 3149055 ns/iter (± 42744) 3150037 ns/iter (± 65324) 1.00
css/visitor/compare/fold_span_panic 3329290 ns/iter (± 47141) 3295040 ns/iter (± 56668) 1.01
css/lexer/bootstrap_5_1_3 5163745 ns/iter (± 12346) 5118141 ns/iter (± 13226) 1.01
css/lexer/foundation_6_7_4 4356071 ns/iter (± 726) 4376587 ns/iter (± 2341) 1.00
css/lexer/tailwind_3_1_1 826340 ns/iter (± 945) 825591 ns/iter (± 239) 1.00
css/parser/bootstrap_5_1_3 21516026 ns/iter (± 119732) 21866348 ns/iter (± 251640) 0.98
css/parser/foundation_6_7_4 16981429 ns/iter (± 90627) 17489025 ns/iter (± 309835) 0.97
css/parser/tailwind_3_1_1 3233492 ns/iter (± 6665) 3252503 ns/iter (± 7533) 0.99
es/codegen/colors 318773 ns/iter (± 179602) 694637 ns/iter (± 408522) 0.46
es/codegen/large 1145109 ns/iter (± 576077) 2516340 ns/iter (± 1569443) 0.46
es/codegen/with-parser/colors 47409 ns/iter (± 510) 47444 ns/iter (± 339) 1.00
es/codegen/with-parser/large 517336 ns/iter (± 1459) 518401 ns/iter (± 1663) 1.00
es/minify/libraries/antd 1465265474 ns/iter (± 16482733) 1529683701 ns/iter (± 26451294) 0.96
es/minify/libraries/d3 269499898 ns/iter (± 5998239) 269605658 ns/iter (± 10872101) 1.00
es/minify/libraries/echarts 1086573349 ns/iter (± 5980783) 1145149424 ns/iter (± 21148985) 0.95
es/minify/libraries/jquery 83632050 ns/iter (± 3874307) 83170017 ns/iter (± 1064391) 1.01
es/minify/libraries/lodash 102606742 ns/iter (± 3344220) 96155133 ns/iter (± 1836253) 1.07
es/minify/libraries/moment 48070824 ns/iter (± 1536947) 46455908 ns/iter (± 579055) 1.03
es/minify/libraries/react 17985543 ns/iter (± 540936) 17392866 ns/iter (± 197433) 1.03
es/minify/libraries/terser 222590754 ns/iter (± 5082643) 217529089 ns/iter (± 2650784) 1.02
es/minify/libraries/three 406577289 ns/iter (± 7030651) 398137861 ns/iter (± 12000439) 1.02
es/minify/libraries/typescript 2625268004 ns/iter (± 21725004) 2753852619 ns/iter (± 48224164) 0.95
es/minify/libraries/victory 628938407 ns/iter (± 5812952) 615051356 ns/iter (± 11989201) 1.02
es/minify/libraries/vue 117291507 ns/iter (± 1311069) 123324793 ns/iter (± 3350053) 0.95
es/visitor/compare/clone 2401095 ns/iter (± 20731) 2366298 ns/iter (± 16240) 1.01
es/visitor/compare/visit_mut_span 2802047 ns/iter (± 38900) 2815283 ns/iter (± 35011) 1.00
es/visitor/compare/visit_mut_span_panic 2786512 ns/iter (± 26644) 2852191 ns/iter (± 84867) 0.98
es/visitor/compare/fold_span 3996677 ns/iter (± 171243) 4056571 ns/iter (± 55754) 0.99
es/visitor/compare/fold_span_panic 4124614 ns/iter (± 127639) 4411897 ns/iter (± 230263) 0.93
es/lexer/colors 13410 ns/iter (± 309) 13090 ns/iter (± 11) 1.02
es/lexer/angular 6426203 ns/iter (± 6556) 6385125 ns/iter (± 5109) 1.01
es/lexer/backbone 792441 ns/iter (± 433) 788253 ns/iter (± 1027) 1.01
es/lexer/jquery 4457605 ns/iter (± 1832) 4416512 ns/iter (± 2242) 1.01
es/lexer/jquery mobile 6947392 ns/iter (± 4123) 6888530 ns/iter (± 7006) 1.01
es/lexer/mootools 3488325 ns/iter (± 2860) 3464855 ns/iter (± 2599) 1.01
es/lexer/underscore 657231 ns/iter (± 539) 650994 ns/iter (± 659) 1.01
es/lexer/three 21085490 ns/iter (± 22344) 20924941 ns/iter (± 33457) 1.01
es/lexer/yui 3883657 ns/iter (± 1096) 3877362 ns/iter (± 1572) 1.00
es/parser/colors 29226 ns/iter (± 42) 28862 ns/iter (± 58) 1.01
es/parser/angular 16549273 ns/iter (± 162619) 16841778 ns/iter (± 249867) 0.98
es/parser/backbone 2199214 ns/iter (± 12578) 2172594 ns/iter (± 5970) 1.01
es/parser/jquery 12699262 ns/iter (± 257266) 11796054 ns/iter (± 135465) 1.08
es/parser/jquery mobile 20544278 ns/iter (± 287199) 18561093 ns/iter (± 240395) 1.11
es/parser/mootools 9376645 ns/iter (± 70758) 8961930 ns/iter (± 82425) 1.05
es/parser/underscore 1861541 ns/iter (± 12351) 1836026 ns/iter (± 9857) 1.01
es/parser/three 56802495 ns/iter (± 335777) 54398339 ns/iter (± 532814) 1.04
es/parser/yui 9399169 ns/iter (± 99754) 9187340 ns/iter (± 116124) 1.02
es/preset-env/usage/builtin_type 140987 ns/iter (± 33948) 141551 ns/iter (± 34907) 1.00
es/preset-env/usage/property 19936 ns/iter (± 57) 20151 ns/iter (± 137) 0.99
es/resolver/typescript 115111725 ns/iter (± 3048435) 119665510 ns/iter (± 2321051) 0.96
es/fixer/typescript 80188226 ns/iter (± 1284207) 89908714 ns/iter (± 1325639) 0.89
es/hygiene/typescript 175883769 ns/iter (± 3794977) 195179495 ns/iter (± 5603810) 0.90
es/resolver_with_hygiene/typescript 316128776 ns/iter (± 2189900) 340088664 ns/iter (± 5070560) 0.93
es/visitor/base-perf/module_clone 81053 ns/iter (± 514) 80891 ns/iter (± 353) 1.00
es/visitor/base-perf/fold_empty 90183 ns/iter (± 513) 90541 ns/iter (± 531) 1.00
es/visitor/base-perf/fold_noop_impl_all 90749 ns/iter (± 379) 90795 ns/iter (± 312) 1.00
es/visitor/base-perf/fold_noop_impl_vec 90782 ns/iter (± 356) 91427 ns/iter (± 307) 0.99
es/visitor/base-perf/boxing_boxed_clone 56 ns/iter (± 0) 57 ns/iter (± 0) 0.98
es/visitor/base-perf/boxing_unboxed_clone 41 ns/iter (± 0) 41 ns/iter (± 0) 1
es/visitor/base-perf/boxing_boxed 103 ns/iter (± 0) 102 ns/iter (± 0) 1.01
es/visitor/base-perf/boxing_unboxed 78 ns/iter (± 0) 78 ns/iter (± 0) 1
es/visitor/base-perf/visit_contains_this 3519 ns/iter (± 88) 3746 ns/iter (± 85) 0.94
es/base/parallel/resolver/typescript 5897849776 ns/iter (± 349399072) 6394285354 ns/iter (± 464259191) 0.92
es/base/parallel/hygiene/typescript 2047540761 ns/iter (± 24230038) 2237588689 ns/iter (± 38390424) 0.92
misc/visitors/time-complexity/time 5 108 ns/iter (± 0) 108 ns/iter (± 0) 1
misc/visitors/time-complexity/time 10 342 ns/iter (± 3) 346 ns/iter (± 4) 0.99
misc/visitors/time-complexity/time 15 670 ns/iter (± 2) 690 ns/iter (± 0) 0.97
misc/visitors/time-complexity/time 20 1238 ns/iter (± 0) 1302 ns/iter (± 3) 0.95
misc/visitors/time-complexity/time 40 6613 ns/iter (± 58) 6800 ns/iter (± 26) 0.97
misc/visitors/time-complexity/time 60 17022 ns/iter (± 99) 17313 ns/iter (± 35) 0.98
es/full-target/es2016 252619 ns/iter (± 505) 253829 ns/iter (± 347) 1.00
es/full-target/es2017 245777 ns/iter (± 406) 246858 ns/iter (± 2590) 1.00
es/full-target/es2018 235508 ns/iter (± 265) 235449 ns/iter (± 471) 1.00
es2020_nullish_coalescing 92319 ns/iter (± 250) 92845 ns/iter (± 474) 0.99
es2020_optional_chaining 124634 ns/iter (± 275) 125259 ns/iter (± 272) 1.00
es2022_class_properties 149084 ns/iter (± 298) 149159 ns/iter (± 289) 1.00
es2018_object_rest_spread 95615 ns/iter (± 191) 96529 ns/iter (± 203) 0.99
es2019_optional_catch_binding 85204 ns/iter (± 215) 85063 ns/iter (± 176) 1.00
es2017_async_to_generator 85463 ns/iter (± 254) 86301 ns/iter (± 284) 0.99
es2016_exponentiation 90453 ns/iter (± 272) 90281 ns/iter (± 148) 1.00
es2015_arrow 93384 ns/iter (± 215) 93967 ns/iter (± 277) 0.99
es2015_block_scoped_fn 91909 ns/iter (± 203) 91960 ns/iter (± 162) 1.00
es2015_block_scoping 169599 ns/iter (± 229) 170437 ns/iter (± 315) 1.00

This comment was automatically generated by workflow using github-action-benchmark.

Please sign in to comment.