about summary refs log tree commit diff
path: root/tests
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-02-06 17:19:11 +0000
committerbors <bors@rust-lang.org>2022-02-06 17:19:11 +0000
commit8dc719cb39efe7c16aea0b460173678429a90e8d (patch)
treeddcc3be4aac39120a56749636c3e4ce912a0ab76 /tests
parent093e32052e4f3b0a92293dac4a5524effda86934 (diff)
parentaae64e93b7ad9de1da74623cb961322f65f8600f (diff)
downloadrust-8dc719cb39efe7c16aea0b460173678429a90e8d.tar.gz
rust-8dc719cb39efe7c16aea0b460173678429a90e8d.zip
Auto merge of #8326 - matthiaskrgr:warn_on_multi_configs, r=xFrednet
warn if we find multiple clippy configs

Fixes #8323

---

*Please write a short comment explaining your change (or "none" for internal only changes)*

changelog: warn if we find multiple clippy configs
Diffstat (limited to 'tests')
-rw-r--r--tests/ui-cargo/multiple_config_files/no_warn/Cargo.toml8
-rw-r--r--tests/ui-cargo/multiple_config_files/no_warn/clippy.toml1
-rw-r--r--tests/ui-cargo/multiple_config_files/no_warn/src/main.rs3
-rw-r--r--tests/ui-cargo/multiple_config_files/warn/.clippy.toml1
-rw-r--r--tests/ui-cargo/multiple_config_files/warn/Cargo.toml8
-rw-r--r--tests/ui-cargo/multiple_config_files/warn/clippy.toml1
-rw-r--r--tests/ui-cargo/multiple_config_files/warn/src/main.rs5
-rw-r--r--tests/ui-cargo/multiple_config_files/warn/src/main.stderr2
8 files changed, 29 insertions, 0 deletions
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 00000000000..79c973cbfd2
--- /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 00000000000..cda8d17eed4
--- /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 00000000000..e7a11a969c0
--- /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 00000000000..cda8d17eed4
--- /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 00000000000..3d5c707579b
--- /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 00000000000..cda8d17eed4
--- /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 00000000000..2d0b4a7948c
--- /dev/null
+++ b/tests/ui-cargo/multiple_config_files/warn/src/main.rs
@@ -0,0 +1,5 @@
+// ignore-windows
+
+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 00000000000..2abb4e3e06e
--- /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.