about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorOhad Ravid <ohad.rv@gmail.com>2019-10-26 17:28:02 +0200
committerOhad Ravid <ohad.rv@gmail.com>2019-10-31 17:11:21 +0100
commit026aee62ac04ae79059c902867bbf523afaa3583 (patch)
tree40959a0610ee0178af4c0399517a3e92da67ffef /src/libsyntax
parent92df638162b7ccea6f97a8e1287ed05c5c0818b4 (diff)
downloadrust-026aee62ac04ae79059c902867bbf523afaa3583.tar.gz
rust-026aee62ac04ae79059c902867bbf523afaa3583.zip
Stabilize the `re_rebalance_coherence` feature
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/feature_gate/accepted.rs3
-rw-r--r--src/libsyntax/feature_gate/active.rs4
2 files changed, 3 insertions, 4 deletions
diff --git a/src/libsyntax/feature_gate/accepted.rs b/src/libsyntax/feature_gate/accepted.rs
index a1cf2d42108..ed4b421d9db 100644
--- a/src/libsyntax/feature_gate/accepted.rs
+++ b/src/libsyntax/feature_gate/accepted.rs
@@ -253,6 +253,9 @@ declare_features! (
     (accepted, const_constructor, "1.40.0", Some(61456), None),
     /// Allows the use of `#[cfg(doctest)]`, set when rustdoc is collecting doctests.
     (accepted, cfg_doctest, "1.40.0", Some(62210), None),
+    /// Allows relaxing the coherence rules such that
+    /// `impl<T> ForeignTrait<LocalType> for ForeignType<T>` is permitted.
+    (accepted, re_rebalance_coherence, "1.40.0", Some(55437), None),
 
     // -------------------------------------------------------------------------
     // feature-group-end: accepted features
diff --git a/src/libsyntax/feature_gate/active.rs b/src/libsyntax/feature_gate/active.rs
index 736a363bbfc..bde776e71cf 100644
--- a/src/libsyntax/feature_gate/active.rs
+++ b/src/libsyntax/feature_gate/active.rs
@@ -469,10 +469,6 @@ declare_features! (
     /// Allows exhaustive integer pattern matching on `usize` and `isize`.
     (active, precise_pointer_size_matching, "1.32.0", Some(56354), None),
 
-    /// Allows relaxing the coherence rules such that
-    /// `impl<T> ForeignTrait<LocalType> for ForeignType<T>` is permitted.
-    (active, re_rebalance_coherence, "1.32.0", Some(55437), None),
-
     /// Allows using `#[ffi_returns_twice]` on foreign functions.
     (active, ffi_returns_twice, "1.34.0", Some(58314), None),