diff options
| author | bors <bors@rust-lang.org> | 2022-11-05 20:39:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-11-05 20:39:06 +0000 |
| commit | 1286ee23e4e2dec8c1696d3d76c6b26d97bbcf82 (patch) | |
| tree | f54f08c1654e30f16ab2c2f3569b90ca1330a45d /src/test/ui/error-codes | |
| parent | 371100b1fb811e604f7451eff3b06960587fe1af (diff) | |
| parent | 7874976762bc531fa6330854e35ec4db2182164d (diff) | |
| download | rust-1286ee23e4e2dec8c1696d3d76c6b26d97bbcf82.tar.gz rust-1286ee23e4e2dec8c1696d3d76c6b26d97bbcf82.zip | |
Auto merge of #102458 - JohnTitor:stabilize-instruction-set, r=oli-obk
Stabilize the `instruction_set` feature Closes https://github.com/rust-lang/rust/issues/74727 FCP is complete on https://github.com/rust-lang/rust/issues/74727#issuecomment-1242773253 r? `@pnkfelix` and/or `@nikomatsakis` cc `@xd009642` Signed-off-by: Yuki Okushi <jtitor@2k36.org>
Diffstat (limited to 'src/test/ui/error-codes')
| -rw-r--r-- | src/test/ui/error-codes/E0778.rs | 8 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0778.stderr | 2 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0779.rs | 6 | ||||
| -rw-r--r-- | src/test/ui/error-codes/E0779.stderr | 2 |
4 files changed, 5 insertions, 13 deletions
diff --git a/src/test/ui/error-codes/E0778.rs b/src/test/ui/error-codes/E0778.rs index 60e5c2598f1..74653886d41 100644 --- a/src/test/ui/error-codes/E0778.rs +++ b/src/test/ui/error-codes/E0778.rs @@ -1,8 +1,4 @@ -#![feature(isa_attribute)] - #[instruction_set()] //~ ERROR -fn no_isa_defined() { -} +fn no_isa_defined() {} -fn main() { -} +fn main() {} diff --git a/src/test/ui/error-codes/E0778.stderr b/src/test/ui/error-codes/E0778.stderr index 6ecae792423..42647e5c6a1 100644 --- a/src/test/ui/error-codes/E0778.stderr +++ b/src/test/ui/error-codes/E0778.stderr @@ -1,5 +1,5 @@ error[E0778]: `#[instruction_set]` requires an argument - --> $DIR/E0778.rs:3:1 + --> $DIR/E0778.rs:1:1 | LL | #[instruction_set()] | ^^^^^^^^^^^^^^^^^^^^ diff --git a/src/test/ui/error-codes/E0779.rs b/src/test/ui/error-codes/E0779.rs index 1b4dbce2036..c32dae12c9c 100644 --- a/src/test/ui/error-codes/E0779.rs +++ b/src/test/ui/error-codes/E0779.rs @@ -1,6 +1,2 @@ -#![feature(isa_attribute)] - #[instruction_set(arm::magic)] //~ ERROR -fn main() { - -} +fn main() {} diff --git a/src/test/ui/error-codes/E0779.stderr b/src/test/ui/error-codes/E0779.stderr index da787260d4f..7c6a119a096 100644 --- a/src/test/ui/error-codes/E0779.stderr +++ b/src/test/ui/error-codes/E0779.stderr @@ -1,5 +1,5 @@ error[E0779]: invalid instruction set specified - --> $DIR/E0779.rs:3:1 + --> $DIR/E0779.rs:1:1 | LL | #[instruction_set(arm::magic)] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ |