Skip to content

Commit e9132a4

Browse files
committed
Auto merge of #550 - jyn514:clippy, r=pietroalbini
Fix clippy warnings This fixes the build failure in https://github.com/rust-lang/crater/pull/543/checks?check_run_id=1324273363. This commit can be replicated with cargo clippy --fix -Z unstable-options && cargo fmt`.
2 parents dcc5456 + 5bd21d6 commit e9132a4

File tree

4 files changed

+10
-14
lines changed

4 files changed

+10
-14
lines changed

src/report/mod.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -713,7 +713,7 @@ mod tests {
713713
name: "hello-rs".into(),
714714
sha: None,
715715
};
716-
let gh = Crate::GitHub(repo.clone());
716+
let gh = Crate::GitHub(repo);
717717

718718
let index = Index::new(WORK_DIR.join("crates.io-index"));
719719
index.retrieve_or_update().unwrap();
@@ -745,7 +745,7 @@ mod tests {
745745
name: "hello-rs".into(),
746746
sha: None,
747747
};
748-
let gh = Crate::GitHub(repo.clone());
748+
let gh = Crate::GitHub(repo);
749749

750750
assert_eq!(
751751
crate_to_url(&gh).unwrap(),
@@ -884,7 +884,7 @@ mod tests {
884884
name: "hello-rs".into(),
885885
sha: Some("f00".into()),
886886
};
887-
let gh = Crate::GitHub(repo.clone());
887+
let gh = Crate::GitHub(repo);
888888
let reg = Crate::Registry(RegistryCrate {
889889
name: "syn".into(),
890890
version: "1.0.0".into(),

src/results/db.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ mod tests {
230230
WriteResults,
231231
};
232232
use crate::toolchain::{MAIN_TOOLCHAIN, TEST_TOOLCHAIN};
233-
use base64;
233+
234234
use std::collections::BTreeSet;
235235

236236
#[test]
@@ -434,7 +434,7 @@ mod tests {
434434

435435
assert_eq!(
436436
results.load_log(&ex, &MAIN_TOOLCHAIN, &updated).unwrap(),
437-
Some(EncodedLog::Plain("foo".as_bytes().to_vec()))
437+
Some(EncodedLog::Plain(b"foo".to_vec()))
438438
);
439439
assert_eq!(
440440
results

src/runner/graph.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -62,11 +62,7 @@ pub(super) enum WalkResult {
6262

6363
impl WalkResult {
6464
pub(super) fn is_finished(&self) -> bool {
65-
if let WalkResult::Finished = self {
66-
true
67-
} else {
68-
false
69-
}
65+
matches!(self, WalkResult::Finished)
7066
}
7167
}
7268

tests/minicrater/driver.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -59,13 +59,13 @@ trait Compare {
5959
let actual_file = ex_dir.join(expand_file_names(file, ".actual"));
6060
let expected_file = ex_dir.join(expand_file_names(file, ".expected"));
6161
// Load actual report
62-
let raw_report =
63-
::std::fs::read(file_dir.join(file)).expect(&format!("failed to read {}", file));
62+
let raw_report = ::std::fs::read(file_dir.join(file))
63+
.unwrap_or_else(|_| panic!("failed to read {}", file));
6464
// Test report format
6565
let actual_report = self.format(raw_report);
6666

6767
// Load the expected report
68-
let expected_report = ::std::fs::read(&expected_file).unwrap_or(Vec::new());
68+
let expected_report = ::std::fs::read(&expected_file).unwrap_or_default();
6969

7070
// Write the actual JSON report
7171
::std::fs::write(&actual_file, &actual_report)
@@ -92,7 +92,7 @@ trait Compare {
9292
failed = true;
9393
}
9494
}
95-
return failed;
95+
failed
9696
}
9797
}
9898

0 commit comments

Comments
 (0)