Skip to content

Commit 3e238c9

Browse files
committed
---
yaml --- r: 227047 b: refs/heads/master c: bef1828 h: refs/heads/master i: 227045: 09d5071 227043: 1d5f022 227039: 2cc0c7a v: v3
1 parent cf77da7 commit 3e238c9

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: 48f3507763c646e2353e84f6b0e7269784588d17
2+
refs/heads/master: bef1828d427a3eb9f57d865efc4b615b08714b46
33
refs/heads/snap-stage3: 1af31d4974e33027a68126fa5a5a3c2c6491824f
44
refs/heads/try: b53c0f93eedcdedd4fd89bccc5a3a09d1c5cd23e
55
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/libcore/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
#![feature(reflect)]
8080
#![feature(rustc_attrs)]
8181
#![cfg_attr(stage0, feature(simd))]
82-
#![cfg_attr(not(stage0), feature(simd_basics))]
82+
#![cfg_attr(not(stage0), feature(repr_simd))]
8383
#![feature(staged_api)]
8484
#![feature(unboxed_closures)]
8585

trunk/src/libsyntax/feature_gate.rs

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,10 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Status)] = &[
180180
("type_macros", "1.3.0", Active),
181181

182182
// allow `repr(simd)`, and importing the various simd intrinsics
183-
("simd_basics", "1.3.0", Active),
183+
("repr_simd", "1.4.0", Active),
184184

185185
// Allows cfg(target_feature = "...").
186-
("cfg_target_feature", "1.3.0", Active),
186+
("cfg_target_feature", "1.4.0", Active),
187187

188188
// allow `extern "platform-intrinsic" { ... }`
189189
("platform_intrinsics", "1.4.0", Active),
@@ -422,7 +422,6 @@ pub struct Features {
422422
pub allow_box: bool,
423423
pub allow_pushpop_unsafe: bool,
424424
pub simd_ffi: bool,
425-
pub simd_basics: bool,
426425
pub unmarked_api: bool,
427426
pub negate_unsigned: bool,
428427
/// spans of #![feature] attrs for stable language features. for error reporting
@@ -453,7 +452,6 @@ impl Features {
453452
allow_box: false,
454453
allow_pushpop_unsafe: false,
455454
simd_ffi: false,
456-
simd_basics: false,
457455
unmarked_api: false,
458456
negate_unsigned: false,
459457
declared_stable_lang_features: Vec::new(),
@@ -741,7 +739,7 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> {
741739
if attr.name() == "repr" {
742740
for item in attr.meta_item_list().unwrap_or(&[]) {
743741
if item.name() == "simd" {
744-
self.gate_feature("simd_basics", i.span,
742+
self.gate_feature("repr_simd", i.span,
745743
"SIMD types are experimental and possibly buggy");
746744

747745
}
@@ -979,7 +977,6 @@ fn check_crate_inner<F>(cm: &CodeMap, span_handler: &SpanHandler,
979977
allow_box: cx.has_feature("box_syntax"),
980978
allow_pushpop_unsafe: cx.has_feature("pushpop_unsafe"),
981979
simd_ffi: cx.has_feature("simd_ffi"),
982-
simd_basics: cx.has_feature("simd_basics"),
983980
unmarked_api: cx.has_feature("unmarked_api"),
984981
negate_unsigned: cx.has_feature("negate_unsigned"),
985982
declared_stable_lang_features: accepted_features,

0 commit comments

Comments
 (0)