fn one<P: Into<PathBuf>>(path: P, kind: Kind) -> PathSet {
let mut set = BTreeSet::new();
- set.insert(TaskPath { path: path.into(), kind: Some(kind.into()) });
+ set.insert(TaskPath { path: path.into(), kind: Some(kind) });
PathSet::Set(set)
}
// multiple aliases for the same job
pub fn paths(mut self, paths: &[&str]) -> Self {
self.paths.insert(PathSet::Set(
- paths
- .iter()
- .map(|p| TaskPath { path: p.into(), kind: Some(self.kind.into()) })
- .collect(),
+ paths.iter().map(|p| TaskPath { path: p.into(), kind: Some(self.kind) }).collect(),
));
self
}
}
pub fn suite_path(mut self, suite: &str) -> Self {
- self.paths
- .insert(PathSet::Suite(TaskPath { path: suite.into(), kind: Some(self.kind.into()) }));
+ self.paths.insert(PathSet::Suite(TaskPath { path: suite.into(), kind: Some(self.kind) }));
self
}
// the rustc_llvm cache. That will always work, even though it
// may mean that on the next non-check build we'll need to rebuild
// rustc_llvm. But if LLVM is stale, that'll be a tiny amount
- // of work comparitively, and we'd likely need to rebuild it anyway,
+ // of work comparatively, and we'd likely need to rebuild it anyway,
// so that's okay.
if crate::native::prebuilt_llvm_config(self, target).is_err() {
cargo.env("RUST_CHECK", "1");
// cargo.arg("-Zcheck-cfg-features");
// Enable cfg checking of rustc well-known names
- rustflags.arg("-Zunstable-options").arg("--check-cfg=names()");
+ rustflags
+ .arg("-Zunstable-options")
+ // Enable checking of well known names
+ .arg("--check-cfg=names()")
+ // Enable checking of well known values
+ .arg("--check-cfg=values()");
// Add extra cfg not defined in rustc
for (restricted_mode, name, values) in EXTRA_CHECK_CFGS {
if should_run.paths.iter().any(|s| s.has(path, Some(desc.kind)))
&& !desc.is_excluded(
self,
- &PathSet::Suite(TaskPath { path: path.clone(), kind: Some(desc.kind.into()) }),
+ &PathSet::Suite(TaskPath { path: path.clone(), kind: Some(desc.kind) }),
)
{
return true;
}
/// By default, cargo will pick up on various variables in the environment. However, bootstrap
- /// reuses those variables to pass additional flags to rustdoc, so by default they get overriden.
+ /// reuses those variables to pass additional flags to rustdoc, so by default they get overridden.
/// Explicitly add back any previous value in the environment.
///
/// `prefix` is usually `RUSTFLAGS` or `RUSTDOCFLAGS`.