From 1193abe4c85ecd57f1a5634629874fb153a180ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Kr=C3=BCger?= Date: Sun, 30 Jan 2022 13:32:35 +0100 Subject: [PATCH] multiple configs: add tests --- clippy_lints/src/utils/conf.rs | 4 ++-- tests/ui-cargo/multiple_config_files/no_warn/Cargo.toml | 8 ++++++++ tests/ui-cargo/multiple_config_files/no_warn/clippy.toml | 1 + tests/ui-cargo/multiple_config_files/no_warn/src/main.rs | 3 +++ tests/ui-cargo/multiple_config_files/warn/.clippy.toml | 1 + tests/ui-cargo/multiple_config_files/warn/Cargo.toml | 8 ++++++++ tests/ui-cargo/multiple_config_files/warn/clippy.toml | 1 + tests/ui-cargo/multiple_config_files/warn/src/main.rs | 3 +++ tests/ui-cargo/multiple_config_files/warn/src/main.stderr | 2 ++ 9 files changed, 29 insertions(+), 2 deletions(-) create mode 100644 tests/ui-cargo/multiple_config_files/no_warn/Cargo.toml create mode 100644 tests/ui-cargo/multiple_config_files/no_warn/clippy.toml create mode 100644 tests/ui-cargo/multiple_config_files/no_warn/src/main.rs create mode 100644 tests/ui-cargo/multiple_config_files/warn/.clippy.toml create mode 100644 tests/ui-cargo/multiple_config_files/warn/Cargo.toml create mode 100644 tests/ui-cargo/multiple_config_files/warn/clippy.toml create mode 100644 tests/ui-cargo/multiple_config_files/warn/src/main.rs create mode 100644 tests/ui-cargo/multiple_config_files/warn/src/main.stderr diff --git a/clippy_lints/src/utils/conf.rs b/clippy_lints/src/utils/conf.rs index 36a7e67af6f17..680b2eb1da723 100644 --- a/clippy_lints/src/utils/conf.rs +++ b/clippy_lints/src/utils/conf.rs @@ -333,10 +333,10 @@ pub fn lookup_conf_file() -> io::Result> { Err(e) => return Err(e), Ok(md) if md.is_dir() => {}, Ok(_) => { - // warn if we happen to find two config files + // warn if we happen to find two config files #8323 if let Some(ref found_config_) = found_config { eprintln!( - "Warning: found two config files: {} and {}.\nUsing the first one!", + "Using config file `{}`\nWarning: `{}` will be ignored.", found_config_.display(), config_file.display(), ); diff --git a/tests/ui-cargo/multiple_config_files/no_warn/Cargo.toml b/tests/ui-cargo/multiple_config_files/no_warn/Cargo.toml new file mode 100644 index 0000000000000..79c973cbfd2d5 --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/no_warn/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "no_warn" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tests/ui-cargo/multiple_config_files/no_warn/clippy.toml b/tests/ui-cargo/multiple_config_files/no_warn/clippy.toml new file mode 100644 index 0000000000000..cda8d17eed44c --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/no_warn/clippy.toml @@ -0,0 +1 @@ +avoid-breaking-exported-api = false diff --git a/tests/ui-cargo/multiple_config_files/no_warn/src/main.rs b/tests/ui-cargo/multiple_config_files/no_warn/src/main.rs new file mode 100644 index 0000000000000..e7a11a969c037 --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/no_warn/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/tests/ui-cargo/multiple_config_files/warn/.clippy.toml b/tests/ui-cargo/multiple_config_files/warn/.clippy.toml new file mode 100644 index 0000000000000..cda8d17eed44c --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/warn/.clippy.toml @@ -0,0 +1 @@ +avoid-breaking-exported-api = false diff --git a/tests/ui-cargo/multiple_config_files/warn/Cargo.toml b/tests/ui-cargo/multiple_config_files/warn/Cargo.toml new file mode 100644 index 0000000000000..3d5c707579bca --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/warn/Cargo.toml @@ -0,0 +1,8 @@ +[package] +name = "warn" +version = "0.1.0" +edition = "2021" + +# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html + +[dependencies] diff --git a/tests/ui-cargo/multiple_config_files/warn/clippy.toml b/tests/ui-cargo/multiple_config_files/warn/clippy.toml new file mode 100644 index 0000000000000..cda8d17eed44c --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/warn/clippy.toml @@ -0,0 +1 @@ +avoid-breaking-exported-api = false diff --git a/tests/ui-cargo/multiple_config_files/warn/src/main.rs b/tests/ui-cargo/multiple_config_files/warn/src/main.rs new file mode 100644 index 0000000000000..e7a11a969c037 --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/warn/src/main.rs @@ -0,0 +1,3 @@ +fn main() { + println!("Hello, world!"); +} diff --git a/tests/ui-cargo/multiple_config_files/warn/src/main.stderr b/tests/ui-cargo/multiple_config_files/warn/src/main.stderr new file mode 100644 index 0000000000000..2abb4e3e06e64 --- /dev/null +++ b/tests/ui-cargo/multiple_config_files/warn/src/main.stderr @@ -0,0 +1,2 @@ +Using config file `$SRC_DIR/tests/ui-cargo/multiple_config_files/warn/.clippy.toml` +Warning: `$SRC_DIR/tests/ui-cargo/multiple_config_files/warn/clippy.toml` will be ignored.