diff options
| author | Mazdak Farrokhzad <twingoow@gmail.com> | 2020-04-10 12:48:45 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-10 12:48:45 +0200 |
| commit | 74e93bb8e6cd15dd262868b5e13605e9c595bef7 (patch) | |
| tree | bd881643cd83bd681ed7c6bbcba55fa3d8cc3d11 /src/test/ui | |
| parent | 81a360fe9ac1ab3c0685f5b5ebd225189b0312d3 (diff) | |
| parent | 9d13520a6b00fe239c3990e487cd7449722c0c74 (diff) | |
| download | rust-74e93bb8e6cd15dd262868b5e13605e9c595bef7.tar.gz rust-74e93bb8e6cd15dd262868b5e13605e9c595bef7.zip | |
Rollup merge of #70913 - eddyb:rc-arc-diagnostic-items, r=matthewjasper
Replace "rc"/"arc" lang items with Rc/Arc diagnostic items. `Rc`/`Arc` should have no special semantics, so it seems appropriate for them to not be lang items. r? @matthewjasper
Diffstat (limited to 'src/test/ui')
| -rw-r--r-- | src/test/ui/error-codes/E0152.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0152.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0718.rs | 4 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0718.stderr | 6 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/test/ui/error-codes/E0152.rs b/src/test/ui/error-codes/E0152.rs index dcaf9208835..94467b9bdde 100644 --- a/src/test/ui/error-codes/E0152.rs +++ b/src/test/ui/error-codes/E0152.rs @@ -1,6 +1,6 @@ #![feature(lang_items)] -#[lang = "arc"] +#[lang = "owned_box"] struct Foo; //~ ERROR E0152 fn main() { diff --git a/src/test/ui/error-codes/E0152.stderr b/src/test/ui/error-codes/E0152.stderr index 29981991ee0..fbaa276ce10 100644 --- a/src/test/ui/error-codes/E0152.stderr +++ b/src/test/ui/error-codes/E0152.stderr @@ -1,4 +1,4 @@ -error[E0152]: found duplicate lang item `arc` +error[E0152]: found duplicate lang item `owned_box` --> $DIR/E0152.rs:4:1 | LL | struct Foo; diff --git a/src/test/ui/error-codes/E0718.rs b/src/test/ui/error-codes/E0718.rs index 82ab2d4af1b..909cae0ba25 100644 --- a/src/test/ui/error-codes/E0718.rs +++ b/src/test/ui/error-codes/E0718.rs @@ -1,7 +1,7 @@ #![feature(lang_items)] -// Arc is expected to be a struct, so this will error. -#[lang = "arc"] //~ ERROR language item must be applied to a struct +// Box is expected to be a struct, so this will error. +#[lang = "owned_box"] //~ ERROR language item must be applied to a struct static X: u32 = 42; fn main() {} diff --git a/src/test/ui/error-codes/E0718.stderr b/src/test/ui/error-codes/E0718.stderr index 412c856ce06..30378dd1674 100644 --- a/src/test/ui/error-codes/E0718.stderr +++ b/src/test/ui/error-codes/E0718.stderr @@ -1,8 +1,8 @@ -error[E0718]: `arc` language item must be applied to a struct +error[E0718]: `owned_box` language item must be applied to a struct --> $DIR/E0718.rs:4:1 | -LL | #[lang = "arc"] - | ^^^^^^^^^^^^^^^ attribute should be applied to a struct, not a static item +LL | #[lang = "owned_box"] + | ^^^^^^^^^^^^^^^^^^^^^ attribute should be applied to a struct, not a static item error: aborting due to previous error |