From 6e6d5b1ba036b0867f831ac1d771f9e1f826bb1c Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Wed, 29 Jul 2015 12:01:09 -0700
Subject: [PATCH] Feature gate associated type defaults

There are multiple issues with them as designed and implemented.

cc #27364

Conflicts:
	src/libsyntax/feature_gate.rs
	src/test/auxiliary/xcrate_associated_type_defaults.rs
---
 src/libcore/lib.rs                             |  1 +
 src/libsyntax/feature_gate.rs                  |  7 +++++++
 .../xcrate_associated_type_defaults.rs         | 18 ++++++++++++++++++
 .../feature-gate-assoc-type-defaults.rs        | 15 +++++++++++++++
 src/test/run-pass/default-associated-types.rs  |  2 ++
 src/test/run-pass/issue-25339.rs               |  2 ++
 6 files changed, 45 insertions(+)
 create mode 100644 src/test/auxiliary/xcrate_associated_type_defaults.rs
 create mode 100644 src/test/compile-fail/feature-gate-assoc-type-defaults.rs

diff --git a/src/libcore/lib.rs b/src/libcore/lib.rs
index 030d2a33f8f65..392eaf7801a91 100644
--- a/src/libcore/lib.rs
+++ b/src/libcore/lib.rs
@@ -65,6 +65,7 @@
 #![allow(raw_pointer_derive)]
 #![deny(missing_docs)]
 
+#![feature(associated_type_defaults)]
 #![feature(intrinsics)]
 #![feature(lang_items)]
 #![feature(on_unimplemented)]
diff --git a/src/libsyntax/feature_gate.rs b/src/libsyntax/feature_gate.rs
index 3d0cf9236c25c..e695be48d38be 100644
--- a/src/libsyntax/feature_gate.rs
+++ b/src/libsyntax/feature_gate.rs
@@ -155,6 +155,9 @@ const KNOWN_FEATURES: &'static [(&'static str, &'static str, Status)] = &[
 
     // Allows the definition of `const fn` functions.
     ("const_fn", "1.2.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)
 
@@ -686,6 +689,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);
diff --git a/src/test/auxiliary/xcrate_associated_type_defaults.rs b/src/test/auxiliary/xcrate_associated_type_defaults.rs
new file mode 100644
index 0000000000000..43852a4e793f3
--- /dev/null
+++ b/src/test/auxiliary/xcrate_associated_type_defaults.rs
@@ -0,0 +1,18 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+#![feature(associated_type_defaults)]
+
+pub trait Foo {
+    type Input = usize;
+    fn bar(&self, _: Self::Input) {}
+}
+
+impl Foo for () {}
diff --git a/src/test/compile-fail/feature-gate-assoc-type-defaults.rs b/src/test/compile-fail/feature-gate-assoc-type-defaults.rs
new file mode 100644
index 0000000000000..fc4871a712dff
--- /dev/null
+++ b/src/test/compile-fail/feature-gate-assoc-type-defaults.rs
@@ -0,0 +1,15 @@
+// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+trait Foo {
+    type Bar = u8; //~ ERROR associated type defaults are unstable
+}
+
+fn main() {}
diff --git a/src/test/run-pass/default-associated-types.rs b/src/test/run-pass/default-associated-types.rs
index b3def429b9b8c..3e6c72c993a0a 100644
--- a/src/test/run-pass/default-associated-types.rs
+++ b/src/test/run-pass/default-associated-types.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(associated_type_defaults)]
+
 trait Foo<T> {
     type Out = T;
     fn foo(&self) -> Self::Out;
diff --git a/src/test/run-pass/issue-25339.rs b/src/test/run-pass/issue-25339.rs
index af172000fdb1a..381df7c5d5938 100644
--- a/src/test/run-pass/issue-25339.rs
+++ b/src/test/run-pass/issue-25339.rs
@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+#![feature(associated_type_defaults)]
+
 use std::marker::PhantomData;
 
 pub trait Routing<I> {