diff options
| author | bors <bors@rust-lang.org> | 2016-06-15 13:11:19 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-15 13:11:19 -0700 |
| commit | bb4a79b087158f396b984bdf552d2c90890b12a3 (patch) | |
| tree | 6601cc8468a81051a737590e71948cc2b29b3880 | |
| parent | 5755936a635bf0560947ee1af2ec69f644a70d19 (diff) | |
| parent | 028073dd606206a4383193a6924e83c83ce2f8c3 (diff) | |
| download | rust-bb4a79b087158f396b984bdf552d2c90890b12a3.tar.gz rust-bb4a79b087158f396b984bdf552d2c90890b12a3.zip | |
Auto merge of #34220 - srinivasreddy:rf_cargotest, r=brson
run rustfmt on cargotest folder in src/tools/cargotest
| -rw-r--r-- | src/tools/cargotest/main.rs | 76 |
1 files changed, 38 insertions, 38 deletions
diff --git a/src/tools/cargotest/main.rs b/src/tools/cargotest/main.rs index 9332a8e5f6c..8b7164819a7 100644 --- a/src/tools/cargotest/main.rs +++ b/src/tools/cargotest/main.rs @@ -21,20 +21,18 @@ struct Test { lock: Option<&'static str>, } -const TEST_REPOS: &'static [Test] = &[ - Test { - name: "cargo", - repo: "https://github.com/rust-lang/cargo", - sha: "7d79da08238e3d47e0bc4406155bdcc45ccb8c82", - lock: None, - }, - Test { - name: "iron", - repo: "https://github.com/iron/iron", - sha: "16c858ec2901e2992fe5e529780f59fa8ed12903", - lock: Some(include_str!("lockfiles/iron-Cargo.lock")), - }, -]; +const TEST_REPOS: &'static [Test] = &[Test { + name: "cargo", + repo: "https://github.com/rust-lang/cargo", + sha: "7d79da08238e3d47e0bc4406155bdcc45ccb8c82", + lock: None, + }, + Test { + name: "iron", + repo: "https://github.com/iron/iron", + sha: "16c858ec2901e2992fe5e529780f59fa8ed12903", + lock: Some(include_str!("lockfiles/iron-Cargo.lock")), + }]; fn main() { @@ -52,8 +50,10 @@ fn test_repo(cargo: &Path, out_dir: &Path, test: &Test) { println!("testing {}", test.repo); let dir = clone_repo(test, out_dir); if let Some(lockfile) = test.lock { - File::create(&dir.join("Cargo.lock")).expect("") - .write_all(lockfile.as_bytes()).expect(""); + File::create(&dir.join("Cargo.lock")) + .expect("") + .write_all(lockfile.as_bytes()) + .expect(""); } if !run_cargo_test(cargo, &dir) { panic!("tests failed for {}", test.repo); @@ -65,10 +65,10 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf { if !out_dir.join(".git").is_dir() { let status = Command::new("git") - .arg("init") - .arg(&out_dir) - .status() - .expect(""); + .arg("init") + .arg(&out_dir) + .status() + .expect(""); assert!(status.success()); } @@ -77,23 +77,23 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf { for depth in &[0, 1, 10, 100, 1000, 100000] { if *depth > 0 { let status = Command::new("git") - .arg("fetch") - .arg(test.repo) - .arg("master") - .arg(&format!("--depth={}", depth)) - .current_dir(&out_dir) - .status() - .expect(""); + .arg("fetch") + .arg(test.repo) + .arg("master") + .arg(&format!("--depth={}", depth)) + .current_dir(&out_dir) + .status() + .expect(""); assert!(status.success()); } let status = Command::new("git") - .arg("reset") - .arg(test.sha) - .arg("--hard") - .current_dir(&out_dir) - .status() - .expect(""); + .arg("reset") + .arg(test.sha) + .arg("--hard") + .current_dir(&out_dir) + .status() + .expect(""); if status.success() { found = true; @@ -105,11 +105,11 @@ fn clone_repo(test: &Test, out_dir: &Path) -> PathBuf { panic!("unable to find commit {}", test.sha) } let status = Command::new("git") - .arg("clean") - .arg("-fdx") - .current_dir(&out_dir) - .status() - .unwrap(); + .arg("clean") + .arg("-fdx") + .current_dir(&out_dir) + .status() + .unwrap(); assert!(status.success()); out_dir |
