---

yaml
---
r: 233467
b: refs/heads/beta
c: bef1828
h: refs/heads/master
i:
  233465: cc197cb
  233463: 1fb1e26
v: v3

Author: huonw

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: 48f3507763c646e2353e84f6b0e7269784588d17
+refs/heads/beta: bef1828d427a3eb9f57d865efc4b615b08714b46
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: 370fe2786109360f7c35b8ba552b83b773dd71d6
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/libcore/lib.rs

@@ -79,7 +79,7 @@
 #![feature(reflect)]
 #![feature(rustc_attrs)]
 #![cfg_attr(stage0, feature(simd))]
-#![cfg_attr(not(stage0), feature(simd_basics))]
+#![cfg_attr(not(stage0), feature(repr_simd))]
 #![feature(staged_api)]
 #![feature(unboxed_closures)]
 

branches/beta/src/libsyntax/feature_gate.rs

@@ -180,10 +180,10 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Status)] = &[
     ("type_macros", "1.3.0", Active),
 
     // allow `repr(simd)`, and importing the various simd intrinsics
-    ("simd_basics", "1.3.0", Active),
+    ("repr_simd", "1.4.0", Active),
 
     // Allows cfg(target_feature = "...").
-    ("cfg_target_feature", "1.3.0", Active),
+    ("cfg_target_feature", "1.4.0", Active),
 
     // allow `extern "platform-intrinsic" { ... }`
     ("platform_intrinsics", "1.4.0", Active),
@@ -422,7 +422,6 @@ pub struct Features {
     pub allow_box: bool,
     pub allow_pushpop_unsafe: bool,
     pub simd_ffi: bool,
-    pub simd_basics: bool,
     pub unmarked_api: bool,
     pub negate_unsigned: bool,
     /// spans of #![feature] attrs for stable language features. for error reporting
@@ -453,7 +452,6 @@ impl Features {
             allow_box: false,
             allow_pushpop_unsafe: false,
             simd_ffi: false,
-            simd_basics: false,
             unmarked_api: false,
             negate_unsigned: false,
             declared_stable_lang_features: Vec::new(),
@@ -741,7 +739,7 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> {
                     if attr.name() == "repr" {
                         for item in attr.meta_item_list().unwrap_or(&[]) {
                             if item.name() == "simd" {
-                                self.gate_feature("simd_basics", i.span,
+                                self.gate_feature("repr_simd", i.span,
                                                   "SIMD types are experimental and possibly buggy");
 
                             }
@@ -979,7 +977,6 @@ fn check_crate_inner<F>(cm: &CodeMap, span_handler: &SpanHandler,
         allow_box: cx.has_feature("box_syntax"),
         allow_pushpop_unsafe: cx.has_feature("pushpop_unsafe"),
         simd_ffi: cx.has_feature("simd_ffi"),
-        simd_basics: cx.has_feature("simd_basics"),
         unmarked_api: cx.has_feature("unmarked_api"),
         negate_unsigned: cx.has_feature("negate_unsigned"),
         declared_stable_lang_features: accepted_features,