diff options
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/quote.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 5 | ||||
| -rw-r--r-- | src/libsyntax/lib.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 12 |
4 files changed, 8 insertions, 13 deletions
diff --git a/src/libsyntax/ext/quote.rs b/src/libsyntax/ext/quote.rs index fc6cacb40f1..496f6a429a3 100644 --- a/src/libsyntax/ext/quote.rs +++ b/src/libsyntax/ext/quote.rs @@ -178,7 +178,7 @@ pub mod rt { let mut v = vec![]; for (i, x) in self.iter().enumerate() { if i > 0 { - v.push_all(&$sep); + v.extend_from_slice(&$sep); } v.extend(x.to_tokens(cx)); } diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index e00c3e3bea4..c456b7dc8b9 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -132,7 +132,7 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Option<u32>, Status ("unmarked_api", "1.0.0", None, Active), // Allows using #![no_std] - ("no_std", "1.0.0", Some(27701), Active), + ("no_std", "1.0.0", None, Accepted), // Allows using #![no_core] ("no_core", "1.3.0", Some(29639), Active), @@ -286,8 +286,7 @@ pub const KNOWN_ATTRIBUTES: &'static [(&'static str, AttributeType, AttributeGat ("plugin", CrateLevel, Gated("plugin", "compiler plugins are experimental \ and possibly buggy")), - ("no_std", CrateLevel, Gated("no_std", - "no_std is experimental")), + ("no_std", CrateLevel, Ungated), ("no_core", CrateLevel, Gated("no_core", "no_core is experimental")), ("lang", Normal, Gated("lang_items", diff --git a/src/libsyntax/lib.rs b/src/libsyntax/lib.rs index 9401999465b..4498120a78f 100644 --- a/src/libsyntax/lib.rs +++ b/src/libsyntax/lib.rs @@ -29,7 +29,6 @@ #![cfg_attr(stage0, feature(rustc_attrs))] #![cfg_attr(stage0, allow(unused_attributes))] #![feature(associated_consts)] -#![feature(drain)] #![feature(filling_drop)] #![feature(libc)] #![feature(rustc_private)] @@ -37,7 +36,6 @@ #![feature(str_char)] #![feature(str_escape)] #![feature(unicode)] -#![feature(vec_push_all)] extern crate fmt_macros; extern crate serialize; diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index aa55cb847fa..f7105951296 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -120,17 +120,15 @@ pub fn print_crate<'a>(cm: &'a CodeMap, // However we don't want these attributes in the AST because // of the feature gate, so we fake them up here. - let no_std_meta = attr::mk_word_item(InternedString::new("no_std")); + // #![feature(prelude_import)] let prelude_import_meta = attr::mk_word_item(InternedString::new("prelude_import")); - - // #![feature(no_std)] - let fake_attr = attr::mk_attr_inner(attr::mk_attr_id(), - attr::mk_list_item(InternedString::new("feature"), - vec![no_std_meta.clone(), - prelude_import_meta])); + let list = attr::mk_list_item(InternedString::new("feature"), + vec![prelude_import_meta]); + let fake_attr = attr::mk_attr_inner(attr::mk_attr_id(), list); try!(s.print_attribute(&fake_attr)); // #![no_std] + let no_std_meta = attr::mk_word_item(InternedString::new("no_std")); let fake_attr = attr::mk_attr_inner(attr::mk_attr_id(), no_std_meta); try!(s.print_attribute(&fake_attr)); } |