about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-08-07 18:51:51 +0800
committerkennytm <kennytm@gmail.com>2018-08-07 18:51:51 +0800
commit9da780dcc7f457a1ecf8cdfd512372d59e56b59a (patch)
tree155dd3da6dcff72014f588409a0515d4e08c22dd /src/libsyntax
parenta5cd4b56076b32646b5aad123c0bfa1e9480ea42 (diff)
parent1fd8e57c5b329e253404161bddcf29e0bfc12f0b (diff)
downloadrust-9da780dcc7f457a1ecf8cdfd512372d59e56b59a.tar.gz
rust-9da780dcc7f457a1ecf8cdfd512372d59e56b59a.zip
Rollup merge of #53135 - joshtriplett:remove-catch-from-2018-preview, r=Mark-Simulacrum
Rust 2018: Disable catch_expr, not targeted for 2018 edition

Fixes #52604
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index a3822a4a1f9..3dac7734e91 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -323,7 +323,7 @@ declare_features! (
     (active, abi_x86_interrupt, "1.17.0", Some(40180), None),
 
     // Allows the `catch {...}` expression
-    (active, catch_expr, "1.17.0", Some(31436), Some(Edition::Edition2018)),
+    (active, catch_expr, "1.17.0", Some(31436), None),
 
     // Used to preserve symbols (see llvm.used)
     (active, used, "1.18.0", Some(40289), None),