bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Auto merge of #32516 - nodakai:fix-type-macro-feat-gate, r=alexcrichton

Browse source 
Type macro is tracked at rust-lang/rust#27245, not 27336
This commit is contained in:
bors 2016-03-27 14:10:39 -07:00
commit e1080dca01
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/feature_gate.rs
View file

@ -199,7 +199,7 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Option<u32>, Status
("associated_type_defaults", "1.2.0", Some(29661), Active), ("associated_type_defaults", "1.2.0", Some(29661), Active),
// Allows macros to appear in the type position. // Allows macros to appear in the type position.
("type_macros", "1.3.0", Some(27336), Active), ("type_macros", "1.3.0", Some(27245), Active),
// allow `repr(simd)`, and importing the various simd intrinsics // allow `repr(simd)`, and importing the various simd intrinsics
("repr_simd", "1.4.0", Some(27731), Active), ("repr_simd", "1.4.0", Some(27731), Active),

2
src/test/compile-fail/type-macros-fail.rs
View file

@ -14,7 +14,7 @@ macro_rules! Id {
struct Foo<T> { struct Foo<T> {
x: Id!(T) x: Id!(T)
//~^ ERROR: type macros are experimental (see issue #27336) //~^ ERROR: type macros are experimental (see issue #27245)
} }
fn main() { fn main() {