Skip to content

Commit 5c8e64a

Browse files
Merge pull request #1010 from Mark-Simulacrum/fix-warnings
Fix new warnings generated on nightly
2 parents aaf6433 + ec2c6da commit 5c8e64a

File tree

2 files changed

+2
-10
lines changed

2 files changed

+2
-10
lines changed

collector/src/execute.rs

+2-3
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() {

collector/src/sysroot.rs

-7
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
use anyhow::{anyhow, Context};
2-
use chrono::{DateTime, Utc};
32
use std::fmt;
43
use std::fs::{self, File};
54
use std::io::{BufReader, Read};
65
use std::path::PathBuf;
76
use tar::Archive;
87
use xz2::bufread::XzDecoder;
98

10-
#[derive(Debug, Clone)]
11-
struct Commit {
12-
sha: String,
13-
date: DateTime<Utc>,
14-
}
15-
169
pub struct Sysroot {
1710
pub sha: String,
1811
pub rustc: PathBuf,

0 commit comments

Comments
 (0)