From 698f8c2f01ea549d77d7dc3338a12e04c11057b9 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 17 Apr 2024 14:02:58 +0200 Subject: Adding upstream version 1.64.0+dfsg1. Signed-off-by: Daniel Baumann --- .../tests/ui-cargo/duplicate_mod/fail/Cargo.toml | 5 ++ .../tests/ui-cargo/duplicate_mod/fail/src/a.rs | 1 + .../tests/ui-cargo/duplicate_mod/fail/src/b.rs | 1 + .../tests/ui-cargo/duplicate_mod/fail/src/c.rs | 1 + .../tests/ui-cargo/duplicate_mod/fail/src/d.rs | 1 + .../duplicate_mod/fail/src/from_other_module.rs | 1 + .../tests/ui-cargo/duplicate_mod/fail/src/main.rs | 28 ++++++++++++ .../ui-cargo/duplicate_mod/fail/src/main.stderr | 53 ++++++++++++++++++++++ .../duplicate_mod/fail/src/other_module/mod.rs | 2 + 9 files changed, 93 insertions(+) create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/Cargo.toml create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/a.rs create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/b.rs create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/c.rs create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/d.rs create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/from_other_module.rs create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.rs create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.stderr create mode 100644 src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/other_module/mod.rs (limited to 'src/tools/clippy/tests/ui-cargo/duplicate_mod') diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/Cargo.toml b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/Cargo.toml new file mode 100644 index 000000000..bf3c817de --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/Cargo.toml @@ -0,0 +1,5 @@ +[package] +name = "duplicate_mod" +edition = "2021" +publish = false +version = "0.1.0" diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/a.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/a.rs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/a.rs @@ -0,0 +1 @@ + diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/b.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/b.rs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/b.rs @@ -0,0 +1 @@ + diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/c.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/c.rs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/c.rs @@ -0,0 +1 @@ + diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/d.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/d.rs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/d.rs @@ -0,0 +1 @@ + diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/from_other_module.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/from_other_module.rs new file mode 100644 index 000000000..8b1378917 --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/from_other_module.rs @@ -0,0 +1 @@ + diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.rs new file mode 100644 index 000000000..6478e65ac --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.rs @@ -0,0 +1,28 @@ +#![feature(lint_reasons)] + +mod a; + +mod b; +#[path = "b.rs"] +mod b2; + +mod c; +#[path = "c.rs"] +mod c2; +#[path = "c.rs"] +mod c3; + +mod from_other_module; +mod other_module; + +mod d; +#[path = "d.rs"] +mod d2; +#[path = "d.rs"] +#[expect(clippy::duplicate_mod)] +mod d3; +#[path = "d.rs"] +#[allow(clippy::duplicate_mod)] +mod d4; + +fn main() {} diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.stderr b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.stderr new file mode 100644 index 000000000..b450a2b18 --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/main.stderr @@ -0,0 +1,53 @@ +error: file is loaded as a module multiple times: `$DIR/b.rs` + --> $DIR/main.rs:5:1 + | +LL | mod b; + | ^^^^^^ first loaded here +LL | / #[path = "b.rs"] +LL | | mod b2; + | |_______^ loaded again here + | + = note: `-D clippy::duplicate-mod` implied by `-D warnings` + = help: replace all but one `mod` item with `use` items + +error: file is loaded as a module multiple times: `$DIR/c.rs` + --> $DIR/main.rs:9:1 + | +LL | mod c; + | ^^^^^^ first loaded here +LL | / #[path = "c.rs"] +LL | | mod c2; + | |_______^ loaded again here +LL | / #[path = "c.rs"] +LL | | mod c3; + | |_______^ loaded again here + | + = help: replace all but one `mod` item with `use` items + +error: file is loaded as a module multiple times: `$DIR/d.rs` + --> $DIR/main.rs:18:1 + | +LL | mod d; + | ^^^^^^ first loaded here +LL | / #[path = "d.rs"] +LL | | mod d2; + | |_______^ loaded again here + | + = help: replace all but one `mod` item with `use` items + +error: file is loaded as a module multiple times: `$DIR/from_other_module.rs` + --> $DIR/main.rs:15:1 + | +LL | mod from_other_module; + | ^^^^^^^^^^^^^^^^^^^^^^ first loaded here + | + ::: $DIR/other_module/mod.rs:1:1 + | +LL | / #[path = "../from_other_module.rs"] +LL | | mod m; + | |______^ loaded again here + | + = help: replace all but one `mod` item with `use` items + +error: aborting due to 4 previous errors + diff --git a/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/other_module/mod.rs b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/other_module/mod.rs new file mode 100644 index 000000000..36ce7286a --- /dev/null +++ b/src/tools/clippy/tests/ui-cargo/duplicate_mod/fail/src/other_module/mod.rs @@ -0,0 +1,2 @@ +#[path = "../from_other_module.rs"] +mod m; -- cgit v1.2.3