Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion tests/ui/eii/default/call_default.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//@ aux-build: decl_with_default.rs
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests EIIs with default implementations.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/default/call_default_panics.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
//@ run-pass
//@ needs-unwind
//@ exec-env:RUST_BACKTRACE=1
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// A small test to make sure that unwinding works properly.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/default/call_impl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ aux-build: impl1.rs
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests EIIs with default implementations.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/default/local_crate.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests EIIs with default implementations.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/default/local_crate_explicit.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests EIIs with default implementations.
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/default/local_crate_explicit.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
warning: function `decl1` is never used
--> $DIR/local_crate_explicit.rs:11:8
--> $DIR/local_crate_explicit.rs:10:8
|
LL | pub fn decl1(x: u64) {
| ^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/duplicate/both_decl_and_impl.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests that one item can't both define and impl an EII at the same time
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/eii/duplicate/both_decl_and_impl.stderr
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
error: a single item cannot both declare and implement EIIs
--> $DIR/both_decl_and_impl.rs:11:1
--> $DIR/both_decl_and_impl.rs:10:1
|
LL | #[eii]
| ^^^^^^

error: only a small subset of attributes are supported on externally implementable items
--> $DIR/both_decl_and_impl.rs:21:1
--> $DIR/both_decl_and_impl.rs:20:1
|
LL | fn d(x: u64) {}
| ^^^^^^^^^^^^
|
note: this attribute is not supported
--> $DIR/both_decl_and_impl.rs:20:1
--> $DIR/both_decl_and_impl.rs:19:1
|
LL | #[c]
| ^^^^

error: `#[c]` function required, but not found
--> $DIR/both_decl_and_impl.rs:16:4
--> $DIR/both_decl_and_impl.rs:15:4
|
LL | fn c(x: u64);
| ^ expected because `#[c]` was declared here in crate `both_decl_and_impl`
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/duplicate/duplicate1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//@[dylib] needs-crate-type: dylib
//@ aux-build: impl1.rs
//@ aux-build: impl2.rs
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// tests that EIIs error properly, even if the conflicting implementations live in another crate.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/duplicate/duplicate2.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ aux-build: impl1.rs
//@ aux-build: impl2.rs
//@ aux-build: impl3.rs
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests the error message when there are multiple implementations of an EII in many crates.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/duplicate/duplicate3.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//@ aux-build: impl2.rs
//@ aux-build: impl3.rs
//@ aux-build: impl4.rs
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests the error message when there are multiple implementations of an EII in many crates.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/duplicate/dylib_default_duplicate.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ aux-build: dylib_default.rs
//@ needs-crate-type: dylib
//@ compile-flags: --emit link
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Regression test for https://github.com/rust-lang/rust/issues/156320.
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/duplicate/dylib_default_duplicate.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: multiple implementations of `#[eii1]`
--> $DIR/dylib_default_duplicate.rs:15:1
--> $DIR/dylib_default_duplicate.rs:14:1
|
LL | fn other(x: u64) {
| ^^^^^^^^^^^^^^^^ first implemented here in crate `dylib_default_duplicate`
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/duplicate/multiple_impls.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests that one item can't implement two EIIs
Expand Down
8 changes: 4 additions & 4 deletions tests/ui/eii/duplicate/multiple_impls.stderr
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
error: a single item cannot implement multiple EIIs
--> $DIR/multiple_impls.rs:15:1
--> $DIR/multiple_impls.rs:14:1
|
LL | #[b]
| ^^^^

error: a single item cannot implement multiple EIIs
--> $DIR/multiple_impls.rs:29:1
--> $DIR/multiple_impls.rs:28:1
|
LL | #[d]
| ^^^^

error: `#[a]` function required, but not found
--> $DIR/multiple_impls.rs:8:4
--> $DIR/multiple_impls.rs:7:4
|
LL | fn a(x: u64);
| ^ expected because `#[a]` was declared here in crate `multiple_impls`
|
= help: expected at least one implementation in crate `multiple_impls` or any of its dependencies

error: `#[c]` static required, but not found
--> $DIR/multiple_impls.rs:21:7
--> $DIR/multiple_impls.rs:20:7
|
LL | #[eii(c)]
| ^ expected because `#[c]` was declared here in crate `multiple_impls`
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/eii_impl_with_contract.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ run-pass
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu

Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/linking/codegen_cross_crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//@ check-run-results
//@ aux-build: codegen_cross_crate_other_crate.rs
//@ compile-flags: -O
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether calling EIIs works with the declaration in another crate.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/linking/codegen_single_crate.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether calling EIIs works with the declaration in the same crate.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/linking/same-symbol.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
#![feature(extern_item_impls)]
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/linking/track_caller_cross_crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//@ check-run-results
//@ aux-build: track_caller_cross_other_crate.rs
//@ compile-flags: -O
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests that `#[track_caller]` on an EII declaration in one crate is derived
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/privacy1.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
//@ run-pass
//@ check-run-results
//@ aux-build: other_crate_privacy1.rs
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether re-exports work.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/shadow_builtin.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether calling EIIs works with the declaration in the same crate.
Expand Down
6 changes: 3 additions & 3 deletions tests/ui/eii/shadow_builtin.stderr
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
error[E0659]: `inline` is ambiguous
--> $DIR/shadow_builtin.rs:11:3
--> $DIR/shadow_builtin.rs:10:3
|
LL | #[inline]
| ^^^^^^ ambiguous name
|
= note: ambiguous because of a name conflict with a builtin attribute
= note: `inline` could refer to a built-in attribute
note: `inline` could also refer to the attribute macro defined here
--> $DIR/shadow_builtin.rs:7:1
--> $DIR/shadow_builtin.rs:6:1
|
LL | #[eii(inline)]
| ^^^^^^^^^^^^^^
= help: use `crate::inline` to refer to this attribute macro unambiguously

error: `#[inline]` function required, but not found
--> $DIR/shadow_builtin.rs:7:7
--> $DIR/shadow_builtin.rs:6:7
|
LL | #[eii(inline)]
| ^^^^^^ expected because `#[inline]` was declared here in crate `shadow_builtin`
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/argument_required.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/argument_required.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `#[eii]` requires the name as an explicit argument when used on a static
--> $DIR/argument_required.rs:7:1
--> $DIR/argument_required.rs:6:1
|
LL | #[eii]
| ^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/cross_crate_decl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
//@ check-run-results
//@ aux-build: cross_crate_decl.rs
//@ compile-flags: -O
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether calling EIIs works with the declaration in another crate.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/cross_crate_def.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ check-run-results
//@ aux-build: cross_crate_def.rs
//@ compile-flags: -O
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether calling EIIs works with the declaration and definition in another crate.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/default.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// FIXME(#157649): static EII defaults currently fail to link on Apple targets.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/default_apple.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
//@ only-apple
//@ ignore-backends: gcc

#![feature(extern_item_impls)]
#![crate_type = "lib"]
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/default_apple.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `#[eii]` cannot be used on statics with a value on Apple targets
--> $DIR/default_apple.rs:7:25
--> $DIR/default_apple.rs:6:25
|
LL | pub static DECL1: u64 = 5;
| ^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/default_cross_crate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
//@ aux-build: decl_with_default.rs
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// FIXME(#157649): static EII defaults currently fail to link on Apple targets.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/default_cross_crate_explicit.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
//@ aux-build: impl_default_override.rs
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// FIXME(#157649): static EII defaults currently fail to link on Apple targets.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/default_explicit.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
//@ run-pass
//@ check-run-results
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// FIXME(#157649): static EII defaults currently fail to link on Apple targets.
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/duplicate.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/duplicate.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: multiple implementations of `#[hello]`
--> $DIR/duplicate.rs:11:1
--> $DIR/duplicate.rs:10:1
|
LL | static HELLO_IMPL1: u64 = 5;
| ^^^^^^^^^^^^^^^^^^^^^^^ first implemented here in crate `duplicate`
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mismatch_fn_static.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/mismatch_fn_static.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `#[hello]` must be used on a function
--> $DIR/mismatch_fn_static.rs:10:1
--> $DIR/mismatch_fn_static.rs:9:1
|
LL | #[hello]
| ^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mismatch_mut.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
4 changes: 2 additions & 2 deletions tests/ui/eii/static/mismatch_mut.stderr
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
error: `#[eii]` cannot be used on mutable statics
--> $DIR/mismatch_mut.rs:7:1
--> $DIR/mismatch_mut.rs:6:1
|
LL | #[eii(hello)]
| ^^^^^^^^^^^^^

error: mutability does not match with the definition of`#[hello]`
--> $DIR/mismatch_mut.rs:11:1
--> $DIR/mismatch_mut.rs:10:1
|
LL | #[hello]
| ^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mismatch_mut2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/mismatch_mut2.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: mutability does not match with the definition of`#[hello]`
--> $DIR/mismatch_mut2.rs:10:1
--> $DIR/mismatch_mut2.rs:9:1
|
LL | #[hello]
| ^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mismatch_safety.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/mismatch_safety.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: safety does not match with the definition of`#[hello]`
--> $DIR/mismatch_safety.rs:10:1
--> $DIR/mismatch_safety.rs:9:1
|
LL | #[hello]
| ^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mismatch_safety2.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/mismatch_safety2.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: static items cannot be declared with `unsafe` safety qualifier outside of `extern` block
--> $DIR/mismatch_safety2.rs:11:1
--> $DIR/mismatch_safety2.rs:10:1
|
LL | unsafe static HELLO_IMPL: u64 = 5;
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mismatch_static_fn.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/mismatch_static_fn.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `#[hello]` must be used on a static
--> $DIR/mismatch_static_fn.rs:10:1
--> $DIR/mismatch_static_fn.rs:9:1
|
LL | #[hello]
| ^^^^^^^^
Expand Down
1 change: 0 additions & 1 deletion tests/ui/eii/static/mut.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
//@ ignore-backends: gcc
// FIXME(#125418): linking on Windows GNU targets is not yet supported.
//@ ignore-windows-gnu
// Tests whether EIIs work on statics
Expand Down
2 changes: 1 addition & 1 deletion tests/ui/eii/static/mut.stderr
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
error: `#[eii]` cannot be used on mutable statics
--> $DIR/mut.rs:7:1
--> $DIR/mut.rs:6:1
|
LL | #[eii(hello)]
| ^^^^^^^^^^^^^
Expand Down
Loading
Loading