about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-04-17 03:34:55 +0800
committerkennytm <kennytm@gmail.com>2018-04-17 03:34:55 +0800
commitbf16e4bc545640f7269d383edd1592737fbdc0c9 (patch)
tree98450fb73c7d15d7294a9bf9e8b2715bda1695d7 /src/libsyntax
parent932431cedadbd07892f699ac28e279b1d00e3b41 (diff)
parent6c3e1d75553a4b2dbafb8d62a565d10a09c61fc2 (diff)
downloadrust-bf16e4bc545640f7269d383edd1592737fbdc0c9.tar.gz
rust-bf16e4bc545640f7269d383edd1592737fbdc0c9.zip
Rollup merge of #49647 - kennytm:duplicated-features, r=aturon
Remove `underscore_lifetimes` and `match_default_bindings` from active feature list

These are already stabilized in 1.26.
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs6
1 files changed, 0 insertions, 6 deletions
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)),