diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-03-17 14:16:29 -0400 |
|---|---|---|
| committer | Corey Farwell <coreyf@rwell.org> | 2017-04-14 22:05:11 -0400 |
| commit | adcdd605be9cbdb338d4ecc2410cde87272f2191 (patch) | |
| tree | b078c4e2b4196dff490db3318824b1693a0a2ef0 /src/libsyntax | |
| parent | c81c958e984b92222909e2ba5c74a2260a44bdae (diff) | |
| download | rust-adcdd605be9cbdb338d4ecc2410cde87272f2191.tar.gz rust-adcdd605be9cbdb338d4ecc2410cde87272f2191.zip | |
Put overlapping impls behind feature gate, add tests
I've added some explicit tests that negative impls are allowed to overlap, and also to make sure that the feature doesn't interfere with specialization. I've not added an explicit test for positive overlapping with negative, as that's already tested elsewhere.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 8b62416dcbd..6e455234196 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -349,6 +349,9 @@ declare_features! ( // Allows module-level inline assembly by way of global_asm!() (active, global_asm, "1.18.0", Some(35119)), + + // Allows overlapping impls of marker traits + (active, overlapping_marker_traits, "1.18.0", Some(29864)), ); declare_features! ( |