diff options
| author | bors <bors@rust-lang.org> | 2019-11-09 05:57:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-09 05:57:14 +0000 |
| commit | 98c173afe4b7019d0b739151b7d4d4343a85ea2b (patch) | |
| tree | ad8151204408e5025fe614b37d6019b649d59b9a /src/libsyntax | |
| parent | 475c713b2f8c41eb06fd1a65f226c77f84fea4a5 (diff) | |
| parent | 3e0759dc0565c3b8e5ca0ab3ace15ae7e91b6ffd (diff) | |
| download | rust-98c173afe4b7019d0b739151b7d4d4343a85ea2b.tar.gz rust-98c173afe4b7019d0b739151b7d4d4343a85ea2b.zip | |
Auto merge of #65879 - ohadravid:stabilize-re-rebalance-coherence, r=nikomatsakis
Stabilize the `re_rebalance_coherence` feature This PR stabilizes [RFC 2451](https://rust-lang.github.io/rfcs/2451-re-rebalancing-coherence.html), re-rebalance coherence. Changes include removing the attribute from tests which tested both the old and new behavior, moving the feature to `accepted` and removing the old logic. I'll also open a [PR](https://github.com/rust-lang-nursery/reference/pull/703) against the reference, updating it with the content of the RFC. Closes #63599 r? @nikomatsakis
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate/accepted.rs | 3 | ||||
| -rw-r--r-- | src/libsyntax/feature_gate/active.rs | 4 |
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..0107611460b 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.41.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 1e77eaaae88..1d198fca56b 100644 --- a/src/libsyntax/feature_gate/active.rs +++ b/src/libsyntax/feature_gate/active.rs @@ -466,10 +466,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), |