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 --- src/test/ui/duplicate/dupe-symbols-1.rs | 14 +++++ src/test/ui/duplicate/dupe-symbols-1.stderr | 8 +++ src/test/ui/duplicate/dupe-symbols-2.rs | 18 ++++++ src/test/ui/duplicate/dupe-symbols-2.stderr | 8 +++ src/test/ui/duplicate/dupe-symbols-3.rs | 14 +++++ src/test/ui/duplicate/dupe-symbols-3.stderr | 8 +++ src/test/ui/duplicate/dupe-symbols-4.rs | 24 ++++++++ src/test/ui/duplicate/dupe-symbols-4.stderr | 8 +++ src/test/ui/duplicate/dupe-symbols-5.rs | 13 +++++ src/test/ui/duplicate/dupe-symbols-5.stderr | 8 +++ src/test/ui/duplicate/dupe-symbols-6.rs | 11 ++++ src/test/ui/duplicate/dupe-symbols-6.stderr | 8 +++ src/test/ui/duplicate/dupe-symbols-7.rs | 12 ++++ src/test/ui/duplicate/dupe-symbols-7.stderr | 10 ++++ src/test/ui/duplicate/dupe-symbols-8.rs | 12 ++++ src/test/ui/duplicate/dupe-symbols-8.stderr | 10 ++++ .../ui/duplicate/duplicate-check-macro-exports.rs | 6 ++ .../duplicate/duplicate-check-macro-exports.stderr | 18 ++++++ src/test/ui/duplicate/duplicate-parameter.rs | 5 ++ src/test/ui/duplicate/duplicate-parameter.stderr | 9 +++ src/test/ui/duplicate/duplicate-type-parameter.rs | 29 ++++++++++ .../ui/duplicate/duplicate-type-parameter.stderr | 66 ++++++++++++++++++++++ 22 files changed, 319 insertions(+) create mode 100644 src/test/ui/duplicate/dupe-symbols-1.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-1.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-2.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-2.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-3.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-3.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-4.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-4.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-5.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-5.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-6.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-6.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-7.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-7.stderr create mode 100644 src/test/ui/duplicate/dupe-symbols-8.rs create mode 100644 src/test/ui/duplicate/dupe-symbols-8.stderr create mode 100644 src/test/ui/duplicate/duplicate-check-macro-exports.rs create mode 100644 src/test/ui/duplicate/duplicate-check-macro-exports.stderr create mode 100644 src/test/ui/duplicate/duplicate-parameter.rs create mode 100644 src/test/ui/duplicate/duplicate-parameter.stderr create mode 100644 src/test/ui/duplicate/duplicate-type-parameter.rs create mode 100644 src/test/ui/duplicate/duplicate-type-parameter.stderr (limited to 'src/test/ui/duplicate') diff --git a/src/test/ui/duplicate/dupe-symbols-1.rs b/src/test/ui/duplicate/dupe-symbols-1.rs new file mode 100644 index 000000000..28e329b56 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-1.rs @@ -0,0 +1,14 @@ +// build-fail + +// +#![crate_type="rlib"] +#![allow(warnings)] + +#[export_name="fail"] +pub fn a() { +} + +#[export_name="fail"] +pub fn b() { +//~^ symbol `fail` is already defined +} diff --git a/src/test/ui/duplicate/dupe-symbols-1.stderr b/src/test/ui/duplicate/dupe-symbols-1.stderr new file mode 100644 index 000000000..933ed5e89 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-1.stderr @@ -0,0 +1,8 @@ +error: symbol `fail` is already defined + --> $DIR/dupe-symbols-1.rs:12:1 + | +LL | pub fn b() { + | ^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-2.rs b/src/test/ui/duplicate/dupe-symbols-2.rs new file mode 100644 index 000000000..e303a790b --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-2.rs @@ -0,0 +1,18 @@ +// build-fail + +// +#![crate_type="rlib"] +#![allow(warnings)] + +pub mod a { + #[no_mangle] + pub extern "C" fn fail() { + } +} + +pub mod b { + #[no_mangle] + pub extern "C" fn fail() { + //~^ symbol `fail` is already defined + } +} diff --git a/src/test/ui/duplicate/dupe-symbols-2.stderr b/src/test/ui/duplicate/dupe-symbols-2.stderr new file mode 100644 index 000000000..b132eae4b --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-2.stderr @@ -0,0 +1,8 @@ +error: symbol `fail` is already defined + --> $DIR/dupe-symbols-2.rs:15:5 + | +LL | pub extern "C" fn fail() { + | ^^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-3.rs b/src/test/ui/duplicate/dupe-symbols-3.rs new file mode 100644 index 000000000..1af2fe98e --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-3.rs @@ -0,0 +1,14 @@ +// build-fail + +// +#![crate_type="rlib"] +#![allow(warnings)] + +#[export_name="fail"] +pub fn a() { +} + +#[no_mangle] +pub fn fail() { +//~^ symbol `fail` is already defined +} diff --git a/src/test/ui/duplicate/dupe-symbols-3.stderr b/src/test/ui/duplicate/dupe-symbols-3.stderr new file mode 100644 index 000000000..6300b4908 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-3.stderr @@ -0,0 +1,8 @@ +error: symbol `fail` is already defined + --> $DIR/dupe-symbols-3.rs:12:1 + | +LL | pub fn fail() { + | ^^^^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-4.rs b/src/test/ui/duplicate/dupe-symbols-4.rs new file mode 100644 index 000000000..de6610c3e --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-4.rs @@ -0,0 +1,24 @@ +// build-fail + +// +// error-pattern: symbol `fail` is already defined +#![crate_type="rlib"] +#![allow(warnings)] + + +pub trait A { + fn fail(self); +} + +struct B; +struct C; + +impl A for B { + #[no_mangle] + fn fail(self) {} +} + +impl A for C { + #[no_mangle] + fn fail(self) {} +} diff --git a/src/test/ui/duplicate/dupe-symbols-4.stderr b/src/test/ui/duplicate/dupe-symbols-4.stderr new file mode 100644 index 000000000..1407a4883 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-4.stderr @@ -0,0 +1,8 @@ +error: symbol `fail` is already defined + --> $DIR/dupe-symbols-4.rs:23:5 + | +LL | fn fail(self) {} + | ^^^^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-5.rs b/src/test/ui/duplicate/dupe-symbols-5.rs new file mode 100644 index 000000000..ea801cef6 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-5.rs @@ -0,0 +1,13 @@ +// build-fail + +// +#![crate_type="rlib"] +#![allow(warnings)] + +#[export_name="fail"] +static HELLO: u8 = 0; + +#[export_name="fail"] +pub fn b() { +//~^ symbol `fail` is already defined +} diff --git a/src/test/ui/duplicate/dupe-symbols-5.stderr b/src/test/ui/duplicate/dupe-symbols-5.stderr new file mode 100644 index 000000000..558f868a0 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-5.stderr @@ -0,0 +1,8 @@ +error: symbol `fail` is already defined + --> $DIR/dupe-symbols-5.rs:11:1 + | +LL | pub fn b() { + | ^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-6.rs b/src/test/ui/duplicate/dupe-symbols-6.rs new file mode 100644 index 000000000..018f4bb7f --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-6.rs @@ -0,0 +1,11 @@ +// build-fail + +#![crate_type="rlib"] +#![allow(warnings)] + +#[export_name="fail"] +static HELLO: u8 = 0; + +#[export_name="fail"] +static HELLO_TWICE: u16 = 0; +//~^ symbol `fail` is already defined diff --git a/src/test/ui/duplicate/dupe-symbols-6.stderr b/src/test/ui/duplicate/dupe-symbols-6.stderr new file mode 100644 index 000000000..6692a63dc --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-6.stderr @@ -0,0 +1,8 @@ +error: symbol `fail` is already defined + --> $DIR/dupe-symbols-6.rs:10:1 + | +LL | static HELLO_TWICE: u16 = 0; + | ^^^^^^^^^^^^^^^^^^^^^^^ + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-7.rs b/src/test/ui/duplicate/dupe-symbols-7.rs new file mode 100644 index 000000000..633ca4c31 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-7.rs @@ -0,0 +1,12 @@ +// build-fail + +// +// error-pattern: entry symbol `main` declared multiple times + +// FIXME https://github.com/rust-lang/rust/issues/59774 +// normalize-stderr-test "thread.*panicked.*Metadata module not compiled.*\n" -> "" +// normalize-stderr-test "note:.*RUST_BACKTRACE=1.*\n" -> "" +#![allow(warnings)] + +#[no_mangle] +fn main(){} diff --git a/src/test/ui/duplicate/dupe-symbols-7.stderr b/src/test/ui/duplicate/dupe-symbols-7.stderr new file mode 100644 index 000000000..1455f0e75 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-7.stderr @@ -0,0 +1,10 @@ +error: entry symbol `main` declared multiple times + --> $DIR/dupe-symbols-7.rs:12:1 + | +LL | fn main(){} + | ^^^^^^^^^ + | + = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/dupe-symbols-8.rs b/src/test/ui/duplicate/dupe-symbols-8.rs new file mode 100644 index 000000000..ce7fa24a9 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-8.rs @@ -0,0 +1,12 @@ +// build-fail +// error-pattern: entry symbol `main` declared multiple times +// +// See #67946. + +#![allow(warnings)] +fn main() { + extern "Rust" { + fn main(); + } + unsafe { main(); } +} diff --git a/src/test/ui/duplicate/dupe-symbols-8.stderr b/src/test/ui/duplicate/dupe-symbols-8.stderr new file mode 100644 index 000000000..8d6a79e12 --- /dev/null +++ b/src/test/ui/duplicate/dupe-symbols-8.stderr @@ -0,0 +1,10 @@ +error: entry symbol `main` declared multiple times + --> $DIR/dupe-symbols-8.rs:7:1 + | +LL | fn main() { + | ^^^^^^^^^ + | + = help: did you use `#[no_mangle]` on `fn main`? Use `#[start]` instead + +error: aborting due to previous error + diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.rs b/src/test/ui/duplicate/duplicate-check-macro-exports.rs new file mode 100644 index 000000000..9ba28acfd --- /dev/null +++ b/src/test/ui/duplicate/duplicate-check-macro-exports.rs @@ -0,0 +1,6 @@ +pub use std::panic; + +#[macro_export] +macro_rules! panic { () => {} } //~ ERROR the name `panic` is defined multiple times + +fn main() {} diff --git a/src/test/ui/duplicate/duplicate-check-macro-exports.stderr b/src/test/ui/duplicate/duplicate-check-macro-exports.stderr new file mode 100644 index 000000000..ba723b38b --- /dev/null +++ b/src/test/ui/duplicate/duplicate-check-macro-exports.stderr @@ -0,0 +1,18 @@ +error[E0255]: the name `panic` is defined multiple times + --> $DIR/duplicate-check-macro-exports.rs:4:1 + | +LL | pub use std::panic; + | ---------- previous import of the macro `panic` here +... +LL | macro_rules! panic { () => {} } + | ^^^^^^^^^^^^^^^^^^ `panic` redefined here + | + = note: `panic` must be defined only once in the macro namespace of this module +help: you can use `as` to change the binding name of the import + | +LL | pub use std::panic as other_panic; + | ~~~~~~~~~~~~~~~~~~~~~~~~~ + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0255`. diff --git a/src/test/ui/duplicate/duplicate-parameter.rs b/src/test/ui/duplicate/duplicate-parameter.rs new file mode 100644 index 000000000..e5b21bbcd --- /dev/null +++ b/src/test/ui/duplicate/duplicate-parameter.rs @@ -0,0 +1,5 @@ +fn f(a: isize, a: isize) {} +//~^ ERROR identifier `a` is bound more than once in this parameter list + +fn main() { +} diff --git a/src/test/ui/duplicate/duplicate-parameter.stderr b/src/test/ui/duplicate/duplicate-parameter.stderr new file mode 100644 index 000000000..f3ef0bcf3 --- /dev/null +++ b/src/test/ui/duplicate/duplicate-parameter.stderr @@ -0,0 +1,9 @@ +error[E0415]: identifier `a` is bound more than once in this parameter list + --> $DIR/duplicate-parameter.rs:1:16 + | +LL | fn f(a: isize, a: isize) {} + | ^ used as parameter more than once + +error: aborting due to previous error + +For more information about this error, try `rustc --explain E0415`. diff --git a/src/test/ui/duplicate/duplicate-type-parameter.rs b/src/test/ui/duplicate/duplicate-type-parameter.rs new file mode 100644 index 000000000..2751b3c8d --- /dev/null +++ b/src/test/ui/duplicate/duplicate-type-parameter.rs @@ -0,0 +1,29 @@ +type Foo = Option; +//~^ ERROR the name `T` is already used + +struct Bar(T); +//~^ ERROR the name `T` is already used + +struct Baz { +//~^ ERROR the name `T` is already used + x: T, +} + +enum Boo { +//~^ ERROR the name `T` is already used + A(T), + B, +} + +fn quux(x: T) {} +//~^ ERROR the name `T` is already used + +trait Qux {} +//~^ ERROR the name `T` is already used + +impl Qux for Option {} +//~^ ERROR the name `T` is already used +//~^^ ERROR the type parameter `T` is not constrained + +fn main() { +} diff --git a/src/test/ui/duplicate/duplicate-type-parameter.stderr b/src/test/ui/duplicate/duplicate-type-parameter.stderr new file mode 100644 index 000000000..6754574f0 --- /dev/null +++ b/src/test/ui/duplicate/duplicate-type-parameter.stderr @@ -0,0 +1,66 @@ +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:1:12 + | +LL | type Foo = Option; + | - ^ already used + | | + | first use of `T` + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:4:14 + | +LL | struct Bar(T); + | - ^ already used + | | + | first use of `T` + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:7:14 + | +LL | struct Baz { + | - ^ already used + | | + | first use of `T` + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:12:12 + | +LL | enum Boo { + | - ^ already used + | | + | first use of `T` + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:18:11 + | +LL | fn quux(x: T) {} + | - ^ already used + | | + | first use of `T` + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:21:13 + | +LL | trait Qux {} + | - ^ already used + | | + | first use of `T` + +error[E0403]: the name `T` is already used for a generic parameter in this item's generic parameters + --> $DIR/duplicate-type-parameter.rs:24:8 + | +LL | impl Qux for Option {} + | - ^ already used + | | + | first use of `T` + +error[E0207]: the type parameter `T` is not constrained by the impl trait, self type, or predicates + --> $DIR/duplicate-type-parameter.rs:24:6 + | +LL | impl Qux for Option {} + | ^ unconstrained type parameter + +error: aborting due to 8 previous errors + +Some errors have detailed explanations: E0207, E0403. +For more information about an error, try `rustc --explain E0207`. -- cgit v1.2.3