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>
This commit is contained in:
bors 2022-11-05 20:39:06 +00:00
commit 1286ee23e4
10 changed files with 9 additions and 52 deletions

View file

@ -3,7 +3,7 @@
// needs-asm-support
// build-pass
#![feature(no_core, lang_items, rustc_attrs, isa_attribute)]
#![feature(no_core, lang_items, rustc_attrs)]
#![no_core]
#![crate_type = "rlib"]

View file

@ -1,8 +1,4 @@
#![feature(isa_attribute)]
#[instruction_set()] //~ ERROR
fn no_isa_defined() {
}
fn no_isa_defined() {}
fn main() {
}
fn main() {}

View file

@ -1,5 +1,5 @@
error[E0778]: `#[instruction_set]` requires an argument
--> $DIR/E0778.rs:3:1
--> $DIR/E0778.rs:1:1
|
LL | #[instruction_set()]
| ^^^^^^^^^^^^^^^^^^^^

View file

@ -1,6 +1,2 @@
#![feature(isa_attribute)]
#[instruction_set(arm::magic)] //~ ERROR
fn main() {
}
fn main() {}

View file

@ -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)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

View file

@ -1,6 +0,0 @@
#[instruction_set]
//~^ ERROR the `#[instruction_set]` attribute is an experimental feature [E0658]
//~| ERROR malformed `instruction_set` attribute input
//~| ERROR must specify an instruction set [E0778]
fn main() {
}

View file

@ -1,25 +0,0 @@
error: malformed `instruction_set` attribute input
--> $DIR/feature-gate-isa_attribute.rs:1:1
|
LL | #[instruction_set]
| ^^^^^^^^^^^^^^^^^^ help: must be of the form: `#[instruction_set(set)]`
error[E0658]: the `#[instruction_set]` attribute is an experimental feature
--> $DIR/feature-gate-isa_attribute.rs:1:1
|
LL | #[instruction_set]
| ^^^^^^^^^^^^^^^^^^
|
= note: see issue #74727 <https://github.com/rust-lang/rust/issues/74727> for more information
= help: add `#![feature(isa_attribute)]` to the crate attributes to enable
error[E0778]: must specify an instruction set
--> $DIR/feature-gate-isa_attribute.rs:1:1
|
LL | #[instruction_set]
| ^^^^^^^^^^^^^^^^^^
error: aborting due to 3 previous errors
Some errors have detailed explanations: E0658, E0778.
For more information about an error, try `rustc --explain E0658`.