diff options
| author | bors <bors@rust-lang.org> | 2017-07-15 14:51:02 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-07-15 14:51:02 +0000 |
| commit | a783fe2f77dfc69bdfbee539488403ff8883fd25 (patch) | |
| tree | 2f2b941613ea1aa7b2d62977052c3504f89398f7 /src/bootstrap | |
| parent | c4373bd6a29e4f68becfb0874f3199b8b0c2d482 (diff) | |
| parent | e3825ecd4c4e79eff77cb0c2ed51447a8a344ce0 (diff) | |
| download | rust-a783fe2f77dfc69bdfbee539488403ff8883fd25.tar.gz rust-a783fe2f77dfc69bdfbee539488403ff8883fd25.zip | |
Auto merge of #43246 - frewsxcv:rollup, r=frewsxcv
Rollup of 8 pull requests - Successful merges: #43074, #43145, #43159, #43202, #43222, #43228, #43229, #43240 - Failed merges:
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/step.rs | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs index c221d707683..5a1ef818ccf 100644 --- a/src/bootstrap/step.rs +++ b/src/bootstrap/step.rs @@ -28,6 +28,7 @@ use std::collections::{BTreeMap, HashSet, HashMap}; use std::mem; +use std::path::PathBuf; use std::process; use check::{self, TestKind}; @@ -1209,11 +1210,19 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd? if paths.len() == 0 && rule.default { Some((rule, 0)) } else { - paths.iter().position(|path| path.ends_with(rule.path)) + paths.iter() + .position(|path| path.ends_with(rule.path)) .map(|priority| (rule, priority)) } }).collect(); + if rules.is_empty() && + !paths.get(0).unwrap_or(&PathBuf::new()) + .ends_with("nonexistent/path/to/trigger/cargo/metadata") { + println!("\nNothing to run...\n"); + process::exit(1); + } + rules.sort_by_key(|&(_, priority)| priority); rules.into_iter().flat_map(|(rule, _)| { |
