Skip to content

Commit f1a38e2

Browse files
committed
broken tests after rebase?
1 parent eada979 commit f1a38e2

File tree

6 files changed

+5
-7
lines changed

6 files changed

+5
-7
lines changed

compiler/rustc_builtin_macros/src/eii.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ fn eii_(
204204
id: ast::DUMMY_NODE_ID,
205205
span,
206206
vis: ast::Visibility { span, kind: ast::VisibilityKind::Inherited, tokens: None },
207-
ident: Ident::dummy(),
207+
ident: Ident::empty(),
208208
kind: ast::ItemKind::ForeignMod(ast::ForeignMod {
209209
extern_span: span,
210210
safety: ast::Safety::Unsafe(span),

tests/ui/eii/duplicate/duplicate1.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ LL | fn other(x: u64) {
99
LL | fn other(x: u64) {
1010
| ---------------- also implemented here in crate `impl2`
1111
|
12-
= help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
12+
= help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
1313

1414
error: aborting due to 1 previous error
1515

tests/ui/eii/duplicate/duplicate2.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | fn other(x: u64) {
1010
| ---------------- also implemented here in crate `impl2`
1111
|
1212
= note: in addition to these two, another implementation was found in crate `impl3`
13-
= help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
13+
= help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
1414

1515
error: aborting due to 1 previous error
1616

tests/ui/eii/duplicate/duplicate3.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ LL | fn other(x: u64) {
1010
| ---------------- also implemented here in crate `impl2`
1111
|
1212
= note: in addition to these two, more implementations were also found in the following crates: `impl3`, `impl4`
13-
= help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict.
13+
= help: an "externally implementable item" can only have a single implementation in the final artifact. When multiple implementations are found, also in different crates, they conflict
1414

1515
error: aborting due to 1 previous error
1616

tests/ui/eii/errors.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ error: `#[eii_macro_for(...)]` expects a list of one or two elements
2222
LL | #[eii_macro_for()]
2323
| ^^^^^^^^^^^^^^^^^^
2424

25-
error: expected this argument to be "unsafe".
25+
error: expected this argument to be "unsafe"
2626
--> $DIR/errors.rs:15:22
2727
|
2828
LL | #[eii_macro_for(bar, hello)]

tests/ui/eii/privacy2.stderr

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ LL | #[eii(eii2)]
2323
| ^^^^^^^^^^^^ an implementation was expected by this declaration
2424
|
2525
= help: expected at least one implementation in crate `privacy2` or any of its dependencies
26-
= note: this error originates in the attribute macro `eii` (in Nightly builds, run with -Z macro-backtrace for more info)
2726

2827
error: couldn't find an implementation for `#[eii3]`
2928
--> $DIR/auxiliary/codegen3.rs:13:5
@@ -32,7 +31,6 @@ LL | #[eii(eii3)]
3231
| ^^^^^^^^^^^^ an implementation was expected by this declaration
3332
|
3433
= help: expected at least one implementation in crate `privacy2` or any of its dependencies
35-
= note: this error originates in the attribute macro `eii` (in Nightly builds, run with -Z macro-backtrace for more info)
3634

3735
error: aborting due to 4 previous errors
3836

0 commit comments

Comments
 (0)