From 026aee62ac04ae79059c902867bbf523afaa3583 Mon Sep 17 00:00:00 2001 From: Ohad Ravid Date: Sat, 26 Oct 2019 17:28:02 +0200 Subject: Stabilize the `re_rebalance_coherence` feature --- src/libsyntax/feature_gate/accepted.rs | 3 +++ src/libsyntax/feature_gate/active.rs | 4 ---- 2 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/libsyntax') 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 ForeignTrait for ForeignType` 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 ForeignTrait for ForeignType` 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), -- cgit 1.4.1-3-g733a5 From 3e0759dc0565c3b8e5ca0ab3ace15ae7e91b6ffd Mon Sep 17 00:00:00 2001 From: Ohad Ravid Date: Thu, 7 Nov 2019 15:20:56 +0100 Subject: Push `re_rebalance_coherence` to 1.41 Co-Authored-By: Mazdak Farrokhzad --- src/libsyntax/feature_gate/accepted.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/libsyntax') diff --git a/src/libsyntax/feature_gate/accepted.rs b/src/libsyntax/feature_gate/accepted.rs index ed4b421d9db..0107611460b 100644 --- a/src/libsyntax/feature_gate/accepted.rs +++ b/src/libsyntax/feature_gate/accepted.rs @@ -255,7 +255,7 @@ declare_features! ( (accepted, cfg_doctest, "1.40.0", Some(62210), None), /// Allows relaxing the coherence rules such that /// `impl ForeignTrait for ForeignType` is permitted. - (accepted, re_rebalance_coherence, "1.40.0", Some(55437), None), + (accepted, re_rebalance_coherence, "1.41.0", Some(55437), None), // ------------------------------------------------------------------------- // feature-group-end: accepted features -- cgit 1.4.1-3-g733a5