about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-04 18:43:00 +0800
committerkennytm <kennytm@gmail.com>2018-04-17 03:28:25 +0800
commit6c3e1d75553a4b2dbafb8d62a565d10a09c61fc2 (patch)
treea2992f41776389afa5e5c5ac39e93b34a3d72a4c
parent49317cd511fbb60178bd5122e484609568938468 (diff)
downloadrust-6c3e1d75553a4b2dbafb8d62a565d10a09c61fc2.tar.gz
rust-6c3e1d75553a4b2dbafb8d62a565d10a09c61fc2.zip
Remove `underscore_lifetimes` and `match_default_bindings` from active feature list
These are already stabilized in 1.26.
-rw-r--r--src/librustc_trans/lib.rs1
-rw-r--r--src/librustc_typeck/lib.rs1
-rw-r--r--src/libsyntax/feature_gate.rs6
3 files changed, 0 insertions, 8 deletions
diff --git a/src/librustc_trans/lib.rs b/src/librustc_trans/lib.rs
index a38d51e7546..49d0f638f20 100644
--- a/src/librustc_trans/lib.rs
+++ b/src/librustc_trans/lib.rs
@@ -29,7 +29,6 @@
 #![feature(slice_sort_by_cached_key)]
 #![feature(optin_builtin_traits)]
 #![feature(inclusive_range_fields)]
-#![feature(underscore_lifetimes)]
 
 use rustc::dep_graph::WorkProduct;
 use syntax_pos::symbol::Symbol;
diff --git a/src/librustc_typeck/lib.rs b/src/librustc_typeck/lib.rs
index a4477e80b98..4b66939963e 100644
--- a/src/librustc_typeck/lib.rs
+++ b/src/librustc_typeck/lib.rs
@@ -82,7 +82,6 @@ This API is completely unstable and subject to change.
 #![feature(slice_patterns)]
 #![feature(slice_sort_by_cached_key)]
 #![feature(dyn_trait)]
-#![feature(underscore_lifetimes)]
 
 #[macro_use] extern crate log;
 #[macro_use] extern crate syntax;
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 73ebfc20876..eaa2050f608 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -378,12 +378,6 @@ declare_features! (
     // Future-proofing enums/structs with #[non_exhaustive] attribute (RFC 2008)
     (active, non_exhaustive, "1.22.0", Some(44109), None),
 
-    // allow `'_` placeholder lifetimes
-    (active, underscore_lifetimes, "1.22.0", Some(44524), None),
-
-    // Default match binding modes (RFC 2005)
-    (active, match_default_bindings, "1.22.0", Some(42640), None),
-
     // Trait object syntax with `dyn` prefix
     (active, dyn_trait, "1.22.0", Some(44662), Some(Edition::Edition2018)),