summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorTaylor Cramer <cramertj@google.com>2018-03-21 18:32:44 -0700
committerTaylor Cramer <cramertj@google.com>2018-03-26 10:43:03 +0200
commit0f5b52e4a8d3004ef2d69b2ec7f410d4b2c9494c (patch)
tree817fd01d71545cf02b1d662698fcf07aa0c68b19 /src/libsyntax
parentc393db67baf3a15ec61351ffb0e3811e07b8a467 (diff)
downloadrust-0f5b52e4a8d3004ef2d69b2ec7f410d4b2c9494c.tar.gz
rust-0f5b52e4a8d3004ef2d69b2ec7f410d4b2c9494c.zip
Stabilize conservative_impl_trait
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate.rs5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index db900ed6e35..1bb369b551d 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -276,9 +276,6 @@ declare_features! (
     // Allows cfg(target_has_atomic = "...").
     (active, cfg_target_has_atomic, "1.9.0", Some(32976), None),
 
-    // Allows `impl Trait` in function return types.
-    (active, conservative_impl_trait, "1.12.0", Some(34511), None),
-
     // Allows exhaustive pattern matching on types that contain uninhabited types.
     (active, exhaustive_patterns, "1.13.0", None, None),
 
@@ -565,6 +562,8 @@ declare_features! (
     (accepted, copy_closures, "1.26.0", Some(44490), None),
     // Allows `impl Trait` in function arguments.
     (accepted, universal_impl_trait, "1.26.0", Some(34511), None),
+    // Allows `impl Trait` in function return types.
+    (accepted, conservative_impl_trait, "1.26.0", Some(34511), None),
 );
 
 // If you change this, please modify src/doc/unstable-book as well. You must