Skip to content

Commit 15a6bde

Browse files
committed
auto merge of #10009 : LeoTestard/rust/asm-feature-gated, r=huonw
Suite of #9991
2 parents c6337f2 + c4bcf77 commit 15a6bde

File tree

9 files changed

+21
-8
lines changed

9 files changed

+21
-8
lines changed

src/librustc/front/feature_gate.rs

+2-5
Original file line numberDiff line numberDiff line change
@@ -124,11 +124,8 @@ impl Visitor<()> for Context {
124124
}
125125

126126
else if path.segments.last().identifier == self.sess.ident_of("asm") {
127-
// NOTE: remove the false once the ASM feature is in the next snapshot
128-
if false {
129-
self.gate_feature("asm", path.span, "inline assembly is not \
130-
stable enough for use and is subject to change");
131-
}
127+
self.gate_feature("asm", path.span, "inline assembly is not \
128+
stable enough for use and is subject to change");
132129
}
133130
}
134131

src/libstd/std.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ they contained the following prologue:
6161
html_favicon_url = "http://www.rust-lang.org/favicon.ico",
6262
html_root_url = "http://static.rust-lang.org/doc/master")];
6363

64-
#[feature(macro_rules, globs)];
64+
#[feature(macro_rules, globs, asm)];
6565

6666
// Don't link to std. We are std.
6767
#[no_std];

src/test/compile-fail/asm-gated.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-test
12-
1311
fn main() {
1412
unsafe {
1513
asm!(""); //~ ERROR inline assembly is not stable enough

src/test/compile-fail/asm-in-bad-modifier.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast #[feature] doesn't work with check-fast
12+
#[feature(asm)];
13+
1114
fn foo(x: int) { info2!("{}", x); }
1215

1316
#[cfg(target_arch = "x86")]

src/test/compile-fail/asm-out-assign-imm.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast #[feature] doesn't work with check-fast
12+
#[feature(asm)];
13+
1114
fn foo(x: int) { info2!("{}", x); }
1215

1316
#[cfg(target_arch = "x86")]

src/test/compile-fail/asm-out-no-modifier.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast #[feature] doesn't work with check-fast
12+
#[feature(asm)];
13+
1114
fn foo(x: int) { info2!("{}", x); }
1215

1316
#[cfg(target_arch = "x86")]

src/test/compile-fail/asm-out-read-uninit.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast #[feature] doesn't work with check-fast
12+
#[feature(asm)];
13+
1114
fn foo(x: int) { info2!("{}", x); }
1215

1316
#[cfg(target_arch = "x86")]

src/test/pretty/raw-str-nonexpr.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,11 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast #[feature] doesn't work with check-fast
1112
// pp-exact
1213

14+
#[feature(asm)];
15+
1316
#[cfg = r#"just parse this"#]
1417
extern mod blah = r##"blah"##;
1518

src/test/run-pass/asm-out-assign.rs

+3
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,9 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// xfail-fast #[feature] doesn't work with check-fast
12+
#[feature(asm)];
13+
1114
#[cfg(target_arch = "x86")]
1215
#[cfg(target_arch = "x86_64")]
1316
pub fn main() {

0 commit comments

Comments
 (0)