diff options
| author | bors <bors@rust-lang.org> | 2015-07-31 04:33:34 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-07-31 04:33:34 +0000 |
| commit | 8d2eb5971a9e91a9c994768055cb9fa192868699 (patch) | |
| tree | f338bad4a0cd40031f3f9db0020875819278a922 /src/libsyntax | |
| parent | cb250b722e8c9c8b2e6dff249ce8e027dce2cd65 (diff) | |
| parent | 4aaf1beffbcf531990168d857df8f9cf62ca1f6b (diff) | |
| download | rust-8d2eb5971a9e91a9c994768055cb9fa192868699.tar.gz rust-8d2eb5971a9e91a9c994768055cb9fa192868699.zip | |
Auto merge of #27382 - brson:gate-assoc-type, r=alexcrichton
There are still problems in both the design and implementation of this, so we don't want it landing in 1.2. cc @arielb1 @nikomatsakis cc #27364 r? @alexcrichton
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/feature_gate.rs | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs index 53b57cdfaa1..945e457a77b 100644 --- a/src/libsyntax/feature_gate.rs +++ b/src/libsyntax/feature_gate.rs @@ -163,8 +163,12 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Status)] = &[ // Allows the definition recursive static items. ("static_recursion", "1.3.0", Active), -// Allows default type parameters to influence type inference. - ("default_type_parameter_fallback", "1.3.0", Active) + + // Allows default type parameters to influence type inference. + ("default_type_parameter_fallback", "1.3.0", Active), + + // Allows associated type defaults + ("associated_type_defaults", "1.2.0", Active), ]; // (changing above list without updating src/doc/reference.md makes @cmr sad) @@ -762,6 +766,10 @@ impl<'a, 'v> Visitor<'v> for PostExpansionVisitor<'a> { self.gate_feature("const_fn", ti.span, "const fn is unstable"); } } + ast::TypeTraitItem(_, Some(_)) => { + self.gate_feature("associated_type_defaults", ti.span, + "associated type defaults are unstable"); + } _ => {} } visit::walk_trait_item(self, ti); |
