OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Auto merge of #75795 - matthiaskrgr:cargotest_clippy, r=Dylan-DPC 

cargotest: fix clippy warnings

Fixes clippy::redundant_static_lifetimes and clippy::toplevel_ref_arg
I also replaced some .expect("") calls with .unwrap()s since there was no message passed by the .expect() anyway.
This commit is contained in:
bors 2020-08-22 11:07:03 +00:00
parent c5a8b7b901 69f963963e
commit 108e90ca78
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/tools/cargotest/main.rs
View File

@ -11,7 +11,7 @@ struct Test {
packages: &'static [&'static str],
}
const TEST_REPOS: &'static [Test] = &[
const TEST_REPOS: &[Test] = &[
Test {
name: "iron",
repo: "https://github.com/iron/iron",
@ -53,9 +53,9 @@ const TEST_REPOS: &'static [Test] = &[
fn main() {
let args = env::args().collect::<Vec<_>>();
let ref cargo = args[1];
let cargo = &args[1];
let out_dir = Path::new(&args[2]);
let ref cargo = Path::new(cargo);
let cargo = &Path::new(cargo);
for test in TEST_REPOS.iter().rev() {
test_repo(cargo, out_dir, test);
@ -77,7 +77,7 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf {
let out_dir = out_dir.join(test.name);
if !out_dir.join(".git").is_dir() {
let status = Command::new("git").arg("init").arg(&out_dir).status().expect("");
let status = Command::new("git").arg("init").arg(&out_dir).status().unwrap();
assert!(status.success());
}
@ -92,7 +92,7 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf {
.arg(&format!("--depth={}", depth))
.current_dir(&out_dir)
.status()
.expect("");
.unwrap();
assert!(status.success());
}
@ -102,7 +102,7 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf {
.arg("--hard")
.current_dir(&out_dir)
.status()
.expect("");
.unwrap();
if status.success() {
found = true;
@ -133,7 +133,7 @@ fn run_cargo_test(cargo_path: &Path, crate_path: &Path, packages: &[&str]) -> bo
.env("RUSTFLAGS", "--cap-lints warn")
.current_dir(crate_path)
.status()
.expect("");
.unwrap();
status.success()
}