diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-04-14 22:05:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-14 22:05:42 -0400 |
| commit | 3adcd1c37e38c57066837152dff02cf0c9ba6e23 (patch) | |
| tree | add43bd1e97808670711899ce2e6a222ccdd51ff /src/libsyntax | |
| parent | 3f79bdc0a9828a146e83dc6c2bfa5eacd4edc265 (diff) | |
| parent | ae9f571cd11d0b822827547ca6fe192cabb55d0d (diff) | |
Rollup merge of #41309 - frewsxcv:sg-implement-rfc-1268, r=nikomatsakis
Implement RFC 1268. Rebased version of https://github.com/rust-lang/rust/pull/40097. Tracking issue: https://github.com/rust-lang/rust/issues/29864.
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! ( |