diff options
| author | bors <bors@rust-lang.org> | 2013-10-22 04:46:22 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-10-22 04:46:22 -0700 |
| commit | 15a6bdebab4e7b811b9a902e3f8ed225c59af06e (patch) | |
| tree | 5aabd7732bd8d303a24bb13f1255d15b2081154b /src/libstd | |
| parent | c6337f2099f4364f6a030153fa7bf55daf9f3680 (diff) | |
| parent | c4bcf7714b1aa3dbf335cc4de6a1017e8dde3680 (diff) | |
| download | rust-15a6bdebab4e7b811b9a902e3f8ed225c59af06e.tar.gz rust-15a6bdebab4e7b811b9a902e3f8ed225c59af06e.zip | |
auto merge of #10009 : LeoTestard/rust/asm-feature-gated, r=huonw
Suite of #9991
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/std.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs index c446fe3d94f..c27609a590a 100644 --- a/src/libstd/std.rs +++ b/src/libstd/std.rs @@ -61,7 +61,7 @@ they contained the following prologue: html_favicon_url = "http://www.rust-lang.org/favicon.ico", html_root_url = "http://static.rust-lang.org/doc/master")]; -#[feature(macro_rules, globs)]; +#[feature(macro_rules, globs, asm)]; // Don't link to std. We are std. #[no_std]; |