Skip to content

Commit

Permalink
Auto merge of #27382 - brson:gate-assoc-type, r=alexcrichton
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Jul 31, 2015
2 parents cb250b7 + 4aaf1be commit 8d2eb59
Show file tree
Hide file tree
Showing 11 changed files with 40 additions and 2 deletions.
1 change: 1 addition & 0 deletions src/libcore/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@
#![allow(raw_pointer_derive)]
#![deny(missing_docs)]

#![feature(associated_type_defaults)]
#![feature(intrinsics)]
#![feature(lang_items)]
#![feature(on_unimplemented)]
Expand Down
12 changes: 10 additions & 2 deletions src/libsyntax/feature_gate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down Expand Up @@ -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);
Expand Down
2 changes: 2 additions & 0 deletions src/test/auxiliary/xcrate_associated_type_defaults.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// 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) {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
// except according to those terms.

#![feature(associated_consts)]
#![feature(associated_type_defaults)]

pub trait Tr {
type Assoc = u8;
Expand Down
15 changes: 15 additions & 0 deletions src/test/compile-fail/feature-gate-assoc-type-defaults.rs
Original file line number Diff line number Diff line change
@@ -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() {}
2 changes: 2 additions & 0 deletions src/test/compile-fail/issue-23073.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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 { type T; }
trait Bar {
type Foo: Foo;
Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/issue-23595-1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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::ops::{Index};

trait Hierarchy {
Expand Down
2 changes: 2 additions & 0 deletions src/test/compile-fail/issue-23595-2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

#![feature(associated_type_defaults)]

pub struct C<AType: A> {a:AType}

pub trait A {
Expand Down
1 change: 1 addition & 0 deletions src/test/compile-fail/lint-missing-doc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
// injected intrinsics by the compiler.
#![deny(missing_docs)]
#![allow(dead_code)]
#![feature(associated_type_defaults)]

//! Some garbage docs for the crate here
#![doc="More garbage"]
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/default-associated-types.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/test/run-pass/issue-25339.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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> {
Expand Down

0 comments on commit 8d2eb59

Please sign in to comment.