#![feature(test)] // compiletest_rs requires this attribute
#![feature(once_cell)]
+#![feature(try_blocks)]
use compiletest_rs as compiletest;
use compiletest_rs::common::Mode as TestMode;
-use std::env::{self, set_var, var};
-use std::ffi::OsStr;
+use std::env::{self, remove_var, set_var, var_os};
+use std::ffi::{OsStr, OsString};
use std::fs;
use std::io;
use std::path::{Path, PathBuf};
// as what we manually pass to `cargo` invocation
fn third_party_crates() -> String {
use std::collections::HashMap;
- static CRATES: &[&str] = &["serde", "serde_derive", "regex", "clippy_lints", "syn", "quote"];
+ static CRATES: &[&str] = &[
+ "clippy_lints",
+ "clippy_utils",
+ "if_chain",
+ "quote",
+ "regex",
+ "serde",
+ "serde_derive",
+ "syn",
+ ];
let dep_dir = cargo::TARGET_LIB.join("deps");
- let mut crates: HashMap<&str, PathBuf> = HashMap::with_capacity(CRATES.len());
- for entry in fs::read_dir(dep_dir).unwrap() {
- let path = match entry {
- Ok(entry) => entry.path(),
- Err(_) => continue,
- };
- if let Some(name) = path.file_name().and_then(OsStr::to_str) {
- for dep in CRATES {
- if name.starts_with(&format!("lib{}-", dep))
- && name.rsplit('.').next().map(|ext| ext.eq_ignore_ascii_case("rlib")) == Some(true)
- {
- if let Some(old) = crates.insert(dep, path.clone()) {
- panic!("Found multiple rlibs for crate `{}`: `{:?}` and `{:?}", dep, old, path);
- }
- break;
- }
- }
+ let mut crates: HashMap<&str, Vec<PathBuf>> = HashMap::with_capacity(CRATES.len());
+ let mut flags = String::new();
+ for entry in fs::read_dir(dep_dir).unwrap().flatten() {
+ let path = entry.path();
+ if let Some(name) = try {
+ let name = path.file_name()?.to_str()?;
+ let (name, _) = name.strip_suffix(".rlib")?.strip_prefix("lib")?.split_once('-')?;
+ CRATES.iter().copied().find(|&c| c == name)?
+ } {
+ flags += &format!(" --extern {}={}", name, path.display());
+ crates.entry(name).or_default().push(path.clone());
}
}
+ crates.retain(|_, paths| paths.len() > 1);
+ if !crates.is_empty() {
+ let crate_names = crates.keys().map(|s| format!("`{}`", s)).collect::<Vec<_>>().join(", ");
+ // add backslashes for an easy copy-paste `rm` command
+ let paths = crates
+ .into_values()
+ .flatten()
+ .map(|p| strip_current_dir(&p).display().to_string())
+ .collect::<Vec<_>>()
+ .join(" \\\n");
+ // Check which action should be done in order to remove compiled deps.
+ // If pre-installed version of compiler is used, `cargo clean` will do.
+ // Otherwise (for bootstrapped compiler), the dependencies directory
+ // must be removed manually.
+ let suggested_action = if std::env::var_os("RUSTC_BOOTSTRAP").is_some() {
+ "removing the stageN-tools directory"
+ } else {
+ "running `cargo clean`"
+ };
- let v: Vec<_> = crates
- .into_iter()
- .map(|(dep, path)| format!("--extern {}={}", dep, path.display()))
- .collect();
- v.join(" ")
+ panic!(
+ "\n----------------------------------------------------------------------\n\
+ ERROR: Found multiple rlibs for crates: {}\n\
+ Try {} or remove the following files:\n\n{}\n\n\
+ For details on this error see https://github.com/rust-lang/rust-clippy/issues/7343\n\
+ ----------------------------------------------------------------------\n",
+ crate_names, suggested_action, paths
+ );
+ }
+ flags
}
fn default_config() -> compiletest::Config {
third_party_crates(),
));
- config.build_base = if cargo::is_rustc_test_suite() {
- // This make the stderr files go to clippy OUT_DIR on rustc repo build dir
- let mut path = PathBuf::from(env!("OUT_DIR"));
- path.push("test_build_base");
- path
- } else {
- host_lib().join("test_build_base")
- };
+ config.build_base = host_lib().join("test_build_base");
config.rustc_path = clippy_driver_path();
config
}
-fn run_mode(cfg: &mut compiletest::Config) {
+fn run_ui(cfg: &mut compiletest::Config) {
cfg.mode = TestMode::Ui;
cfg.src_base = Path::new("tests").join("ui");
- compiletest::run_tests(&cfg);
+ // use tests/clippy.toml
+ let _g = VarGuard::set("CARGO_MANIFEST_DIR", std::fs::canonicalize("tests").unwrap());
+ compiletest::run_tests(cfg);
}
fn run_internal_tests(cfg: &mut compiletest::Config) {
}
cfg.mode = TestMode::Ui;
cfg.src_base = Path::new("tests").join("ui-internal");
- compiletest::run_tests(&cfg);
+ compiletest::run_tests(cfg);
}
fn run_ui_toml(config: &mut compiletest::Config) {
continue;
}
let dir_path = dir.path();
- set_var("CARGO_MANIFEST_DIR", &dir_path);
+ let _g = VarGuard::set("CARGO_MANIFEST_DIR", &dir_path);
for file in fs::read_dir(&dir_path)? {
let file = file?;
let file_path = file.path();
base: config.src_base.clone(),
relative_dir: dir_path.file_name().unwrap().into(),
};
- let test_name = compiletest::make_test_name(&config, &paths);
+ let test_name = compiletest::make_test_name(config, &paths);
let index = tests
.iter()
.position(|test| test.desc.name == test_name)
config.mode = TestMode::Ui;
config.src_base = Path::new("tests").join("ui-toml").canonicalize().unwrap();
- let tests = compiletest::make_tests(&config);
+ let tests = compiletest::make_tests(config);
- let manifest_dir = var("CARGO_MANIFEST_DIR").unwrap_or_default();
- let res = run_tests(&config, tests);
- set_var("CARGO_MANIFEST_DIR", &manifest_dir);
+ let res = run_tests(config, tests);
match res {
Ok(true) => {},
Ok(false) => panic!("Some tests failed"),
Some("main.rs") => {},
_ => continue,
}
- set_var("CLIPPY_CONF_DIR", case.path());
+ let _g = VarGuard::set("CLIPPY_CONF_DIR", case.path());
let paths = compiletest::common::TestPaths {
file: file_path,
base: config.src_base.clone(),
relative_dir: src_path.strip_prefix(&config.src_base).unwrap().into(),
};
- let test_name = compiletest::make_test_name(&config, &paths);
+ let test_name = compiletest::make_test_name(config, &paths);
let index = tests
.iter()
.position(|test| test.desc.name == test_name)
config.mode = TestMode::Ui;
config.src_base = Path::new("tests").join("ui-cargo").canonicalize().unwrap();
- let tests = compiletest::make_tests(&config);
+ let tests = compiletest::make_tests(config);
let current_dir = env::current_dir().unwrap();
- let conf_dir = var("CLIPPY_CONF_DIR").unwrap_or_default();
- let res = run_tests(&config, &config.filters, tests);
+ let res = run_tests(config, &config.filters, tests);
env::set_current_dir(current_dir).unwrap();
- set_var("CLIPPY_CONF_DIR", conf_dir);
match res {
Ok(true) => {},
fn compile_test() {
prepare_env();
let mut config = default_config();
- run_mode(&mut config);
+ run_ui(&mut config);
run_ui_toml(&mut config);
run_ui_cargo(&mut config);
run_internal_tests(&mut config);
}
+
+/// Restores an env var on drop
+#[must_use]
+struct VarGuard {
+ key: &'static str,
+ value: Option<OsString>,
+}
+
+impl VarGuard {
+ fn set(key: &'static str, val: impl AsRef<OsStr>) -> Self {
+ let value = var_os(key);
+ set_var(key, val);
+ Self { key, value }
+ }
+}
+
+impl Drop for VarGuard {
+ fn drop(&mut self) {
+ match self.value.as_deref() {
+ None => remove_var(self.key),
+ Some(value) => set_var(self.key, value),
+ }
+ }
+}
+
+fn strip_current_dir(path: &Path) -> &Path {
+ if let Ok(curr) = env::current_dir() {
+ if let Ok(stripped) = path.strip_prefix(curr) {
+ return stripped;
+ }
+ }
+ path
+}
projects / rust.git / blobdiff