Skip to content

Commit bbd81f2

Browse files
committed
Auto merge of rust-lang#84189 - jyn514:clippy-dev, r=Mark-Simulacrum
Implement `x.py test src/tools/clippy --bless` - Add clippy_dev to the rust workspace Before, it would give an error that it wasn't either included or excluded from the workspace: ``` error: current package believes it's in a workspace when it's not: current: /home/joshua/rustc/src/tools/clippy/clippy_dev/Cargo.toml workspace: /home/joshua/rustc/Cargo.toml this may be fixable by adding `src/tools/clippy/clippy_dev` to the `workspace.members` array of the manifest located at: /home/joshua/rustc/Cargo.toml Alternatively, to keep it out of the workspace, add the package to the `workspace.exclude` array, or add an empty `[workspace]` table to the package's manifest. ``` - Change clippy's copy of compiletest not to special-case rust-lang/rust. Using OUT_DIR confused `clippy_dev` and it couldn't find the test outputs. This is one of the reasons why `cargo dev bless` used to silently do nothing (the others were that `CARGO_TARGET_DIR` and `PROFILE` weren't set appropriately). - Run clippy_dev on test failure I tested this by removing a couple lines from a stderr file, and they were correctly replaced. - Fix clippy_dev warnings
2 parents cd88031 + af0dde2 commit bbd81f2

File tree

2 files changed

+3
-10
lines changed

2 files changed

+3
-10
lines changed

clippy_dev/src/new_lint.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ pub fn create(pass: Option<&str>, lint_name: Option<&str>, category: Option<&str
4444
create_test(&lint).context("Unable to create a test for the new lint")
4545
}
4646

47-
fn create_lint(lint: &LintData) -> io::Result<()> {
47+
fn create_lint(lint: &LintData<'_>) -> io::Result<()> {
4848
let (pass_type, pass_lifetimes, pass_import, context_import) = match lint.pass {
4949
"early" => ("EarlyLintPass", "", "use rustc_ast::ast::*;", "EarlyContext"),
5050
"late" => ("LateLintPass", "<'_>", "use rustc_hir::*;", "LateContext"),
@@ -68,7 +68,7 @@ fn create_lint(lint: &LintData) -> io::Result<()> {
6868
write_file(lint.project_root.join(&lint_path), lint_contents.as_bytes())
6969
}
7070

71-
fn create_test(lint: &LintData) -> io::Result<()> {
71+
fn create_test(lint: &LintData<'_>) -> io::Result<()> {
7272
fn create_project_layout<P: Into<PathBuf>>(lint_name: &str, location: P, case: &str, hint: &str) -> io::Result<()> {
7373
let mut path = location.into().join(case);
7474
fs::create_dir(&path)?;

tests/compile-test.rs

+1-8
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,7 @@ fn default_config() -> compiletest::Config {
8383
third_party_crates(),
8484
));
8585

86-
config.build_base = if cargo::is_rustc_test_suite() {
87-
// This make the stderr files go to clippy OUT_DIR on rustc repo build dir
88-
let mut path = PathBuf::from(env!("OUT_DIR"));
89-
path.push("test_build_base");
90-
path
91-
} else {
92-
host_lib().join("test_build_base")
93-
};
86+
config.build_base = host_lib().join("test_build_base");
9487
config.rustc_path = clippy_driver_path();
9588
config
9689
}

0 commit comments

Comments
 (0)