diff options
| author | bors <bors@rust-lang.org> | 2019-01-05 00:49:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-01-05 00:49:12 +0000 |
| commit | 244b05db12e47efef4695036974bc25fde13b828 (patch) | |
| tree | 3cfddf52e2f53aea3f34500ae4d05b11e4e8f559 /src/libsyntax | |
| parent | bf6bb141bbc77bfb7d9bc79f2db6d986aafc01cc (diff) | |
| parent | d758e4db783618daef974d067fdf6cfb285f48d5 (diff) | |
| download | rust-244b05db12e47efef4695036974bc25fde13b828.tar.gz rust-244b05db12e47efef4695036974bc25fde13b828.zip | |
Auto merge of #56145 - weiznich:re_rebalance_coherence, r=nikomatsakis
Implement the Re-rebalance coherence RFC This is the first time I touch anything in the compiler so just tell me if I got something wrong. Big thanks to @sgrif for the pointers where to look for those things. cc #55437
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 3f2122e24a6..8362c86f8ba 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -479,6 +479,9 @@ declare_features! ( // Allows paths to enum variants on type aliases. (active, type_alias_enum_variants, "1.31.0", Some(49683), None), + + // Re-Rebalance coherence + (active, re_rebalance_coherence, "1.32.0", Some(55437), None), ); declare_features! ( |