auto merge of #13079 : alexcrichton/rust/colons, r=cmr

The previous syntax was `Foo:Bound<trait-parameters>`, but this is a little
ambiguous because it was being parsed as `Foo: (Bound<trait-parameters)` rather
than `Foo: (Bound) <trait-parameters>`

This commit changes the syntax to `Foo<trait-parameters>: Bound` in order to be
clear where the trait parameters are going.

Closes #9265
This commit is contained in:
bors 2014-03-26 19:32:01 -07:00
commit c329a17461
7 changed files with 59 additions and 73 deletions

View file

@ -14,8 +14,8 @@ impl<A:Clone> Repeat<A> for A {
fn get(&self) -> A { self.clone() }
}
fn repeater<A:Clone>(v: A) -> ~Repeat:<A> {
~v as ~Repeat:<A> // No
fn repeater<A:Clone>(v: A) -> ~Repeat<A>: {
~v as ~Repeat<A>: // No
}
fn main() {

View file

@ -27,11 +27,11 @@ impl<A:Clone> Invokable<A> for Invoker<A> {
}
}
fn f<A:Clone + 'static>(a: A, b: u16) -> ~Invokable:<A> {
fn f<A:Clone + 'static>(a: A, b: u16) -> ~Invokable<A>: {
~Invoker {
a: a,
b: b,
} as ~Invokable:<A>
} as ~Invokable<A>:
}
pub fn main() {

View file

@ -31,11 +31,11 @@ impl<A:Clone> Invokable<A> for Invoker<A> {
}
}
fn f<A:Clone + 'static>(a: A, b: u16) -> ~Invokable:<A> {
fn f<A:Clone + 'static>(a: A, b: u16) -> ~Invokable<A>: {
~Invoker {
a: a,
b: b,
} as ~Invokable:<A>
} as ~Invokable<A>:
}
pub fn main() {

View file

@ -16,9 +16,9 @@ impl<A:Clone + 'static> repeat<A> for ~A {
}
}
fn repeater<A:Clone + 'static>(v: ~A) -> ~repeat:<A> {
fn repeater<A:Clone + 'static>(v: ~A) -> ~repeat<A>: {
// Note: owned kind is not necessary as A appears in the trait type
~v as ~repeat:<A> // No
~v as ~repeat<A>: // No
}
pub fn main() {

View file

@ -0,0 +1,27 @@
// Copyright 2014 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.
#[allow(dead_code)];
trait A<T> {}
trait B<T, U> {}
trait C<'a, U> {}
mod foo {
pub trait D<'a, T> {}
}
fn foo1<T>(_: &A<T>: Send) {}
fn foo2<T>(_: ~A<T>: Send + Share) {}
fn foo3<T>(_: ~B<int, uint>: 'static) {}
fn foo4<'a, T>(_: ~C<'a, T>: 'static + Send) {}
fn foo5<'a, T>(_: ~foo::D<'a, T>: 'static + Send) {}
pub fn main() {}