From c200ae5a8a1ab70cfea39ef184e1fd0e87b33181 Mon Sep 17 00:00:00 2001
From: Nick Cameron <ncameron@mozilla.com>
Date: Tue, 2 Dec 2014 14:13:12 -0800
Subject: [PATCH] Remove feature gates for `if let`, `while let`, and tuple
indexing
Closes #19469
---
src/libsyntax/feature_gate.rs | 19 +++----------------
src/test/compile-fail/borrow-tuple-fields.rs | 2 --
src/test/compile-fail/if-let.rs | 2 +-
src/test/compile-fail/issue-18566.rs | 2 --
src/test/compile-fail/issue-19244-1.rs | 2 --
.../compile-fail/lint-unnecessary-parens.rs | 1 -
src/test/compile-fail/move-fragments-1.rs | 2 --
.../compile-fail/move-out-of-tuple-field.rs | 2 --
.../compile-fail/tuple-index-not-tuple.rs | 2 --
.../compile-fail/tuple-index-out-of-bounds.rs | 2 --
src/test/compile-fail/while-let.rs | 2 +-
11 files changed, 5 insertions(+), 33 deletions(-)
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 7453da6374e..c798b70551f 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -65,13 +65,13 @@ static KNOWN_FEATURES: &'static [(&'static str, Status)] = &[
("unboxed_closures", Active),
("import_shadowing", Active),
("advanced_slice_patterns", Active),
- ("tuple_indexing", Active),
+ ("tuple_indexing", Accepted),
("associated_types", Active),
("visible_private_types", Active),
("slicing_syntax", Active),
- ("if_let", Active),
- ("while_let", Active),
+ ("if_let", Accepted),
+ ("while_let", Accepted),
// if you change this list without updating src/doc/reference.md, cmr will be sad
@@ -309,24 +309,11 @@ impl<'a, 'v> Visitor<'v> for Context<'a> {
"unboxed closures are a work-in-progress \
feature with known bugs");
}
- ast::ExprTupField(..) => {
- self.gate_feature("tuple_indexing",
- e.span,
- "tuple indexing is experimental");
- }
- ast::ExprIfLet(..) => {
- self.gate_feature("if_let", e.span,
- "`if let` syntax is experimental");
- }
ast::ExprSlice(..) => {
self.gate_feature("slicing_syntax",
e.span,
"slicing syntax is experimental");
}
- ast::ExprWhileLet(..) => {
- self.gate_feature("while_let", e.span,
- "`while let` syntax is experimental");
- }
_ => {}
}
visit::walk_expr(self, e);
diff --git a/src/test/compile-fail/borrow-tuple-fields.rs b/src/test/compile-fail/borrow-tuple-fields.rs
index 519bad4e627..1d09143c24d 100644
--- a/src/test/compile-fail/borrow-tuple-fields.rs
+++ b/src/test/compile-fail/borrow-tuple-fields.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
struct Foo(Box<int>, int);
struct Bar(int, int);
diff --git a/src/test/compile-fail/if-let.rs b/src/test/compile-fail/if-let.rs
index b82fb7a94c9..88b6854bb1d 100644
--- a/src/test/compile-fail/if-let.rs
+++ b/src/test/compile-fail/if-let.rs
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(macro_rules,if_let)]
+#![feature(macro_rules)]
fn macros() {
macro_rules! foo{
diff --git a/src/test/compile-fail/issue-18566.rs b/src/test/compile-fail/issue-18566.rs
index 89b1d8540d8..f64d8fee2d8 100644
--- a/src/test/compile-fail/issue-18566.rs
+++ b/src/test/compile-fail/issue-18566.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
struct MyPtr<'a>(&'a mut uint);
impl<'a> Deref<uint> for MyPtr<'a> {
fn deref<'b>(&'b self) -> &'b uint { self.0 }
diff --git a/src/test/compile-fail/issue-19244-1.rs b/src/test/compile-fail/issue-19244-1.rs
index 4fcbb878890..7ca83f21305 100644
--- a/src/test/compile-fail/issue-19244-1.rs
+++ b/src/test/compile-fail/issue-19244-1.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
const TUP: (uint,) = (42,);
fn main() {
diff --git a/src/test/compile-fail/lint-unnecessary-parens.rs b/src/test/compile-fail/lint-unnecessary-parens.rs
index 826a4ea5a80..b71effa6f86 100644
--- a/src/test/compile-fail/lint-unnecessary-parens.rs
+++ b/src/test/compile-fail/lint-unnecessary-parens.rs
@@ -9,7 +9,6 @@
// except according to those terms.
#![deny(unused_parens)]
-#![feature(if_let,while_let)]
#[deriving(Eq, PartialEq)]
struct X { y: bool }
diff --git a/src/test/compile-fail/move-fragments-1.rs b/src/test/compile-fail/move-fragments-1.rs
index ccf12cf79e1..e45862a7fc6 100644
--- a/src/test/compile-fail/move-fragments-1.rs
+++ b/src/test/compile-fail/move-fragments-1.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
// Test that we correctly compute the move fragments for a fn.
//
// Note that the code below is not actually incorrect; the
diff --git a/src/test/compile-fail/move-out-of-tuple-field.rs b/src/test/compile-fail/move-out-of-tuple-field.rs
index 7f55a78e8b7..7fcb54e0467 100644
--- a/src/test/compile-fail/move-out-of-tuple-field.rs
+++ b/src/test/compile-fail/move-out-of-tuple-field.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
struct Foo(Box<int>);
fn main() {
diff --git a/src/test/compile-fail/tuple-index-not-tuple.rs b/src/test/compile-fail/tuple-index-not-tuple.rs
index d4ef0e20b26..33aeebb3691 100644
--- a/src/test/compile-fail/tuple-index-not-tuple.rs
+++ b/src/test/compile-fail/tuple-index-not-tuple.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
struct Point { x: int, y: int }
struct Empty;
diff --git a/src/test/compile-fail/tuple-index-out-of-bounds.rs b/src/test/compile-fail/tuple-index-out-of-bounds.rs
index f9bf2746794..609e34f2274 100644
--- a/src/test/compile-fail/tuple-index-out-of-bounds.rs
+++ b/src/test/compile-fail/tuple-index-out-of-bounds.rs
@@ -8,8 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(tuple_indexing)]
-
struct Point(int, int);
fn main() {
diff --git a/src/test/compile-fail/while-let.rs b/src/test/compile-fail/while-let.rs
index 0dd442ec3f6..ccf3d2dd750 100644
--- a/src/test/compile-fail/while-let.rs
+++ b/src/test/compile-fail/while-let.rs
@@ -8,7 +8,7 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
-#![feature(macro_rules,while_let)]
+#![feature(macro_rules)]
fn macros() {
macro_rules! foo{