Skip to content

Commit 499f983

Browse files
Sort patches by numeric index, not path
This may have caused patches to be applied in the wrong order; that should now be fixed. In practice I think our patches likely worked out the same, but hard to be sure. A quick check with sort and sort -n seems to imply things are probably fine, but it may not have worked.
1 parent fb335b3 commit 499f983

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

collector/src/execute.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1166,9 +1166,8 @@ impl Benchmark {
11661166
}
11671167
}
11681168

1169-
patches.sort();
1170-
1171-
let patches = patches.into_iter().map(|p| Patch::new(p)).collect();
1169+
let mut patches: Vec<_> = patches.into_iter().map(|p| Patch::new(p)).collect();
1170+
patches.sort_by_key(|p| p.index);
11721171

11731172
let config_path = path.join("perf-config.json");
11741173
let config: BenchmarkConfig = if config_path.exists() {

0 commit comments

Comments
 (0)