-
Notifications
You must be signed in to change notification settings - Fork 12.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
auto merge of #6695 : catamorphism/rust/moretestcases, r=catamorphism
- Loading branch information
Showing
4 changed files
with
128 additions
and
8 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
// Copyright 2013 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 MyTrait { } | ||
|
||
pub enum TraitWrapper { | ||
A(~MyTrait), | ||
} | ||
|
||
fn get_tw_map<'lt>(tw: &'lt TraitWrapper) -> &'lt MyTrait { | ||
match *tw { | ||
A(~ref map) => map, //~ ERROR mismatched types: expected `~MyTrait` but found a ~-box pattern | ||
} | ||
} | ||
|
||
pub fn main() {} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
// Copyright 2013 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. | ||
|
||
struct Vec2 { | ||
x: float, | ||
y: float | ||
} | ||
|
||
// methods we want to export as methods as well as operators | ||
impl Vec2 { | ||
#[inline(always)] | ||
fn vmul(self, other: float) -> Vec2 { | ||
Vec2 { x: self.x * other, y: self.y * other } | ||
} | ||
} | ||
|
||
// Right-hand-side operator visitor pattern | ||
trait RhsOfVec2Mul<Result> { fn mul_vec2_by(&self, lhs: &Vec2) -> Result; } | ||
|
||
// Vec2's implementation of Mul "from the other side" using the above trait | ||
impl<Res, Rhs: RhsOfVec2Mul<Res>> Mul<Rhs,Res> for Vec2 { | ||
fn mul(&self, rhs: &Rhs) -> Res { rhs.mul_vec2_by(self) } | ||
} | ||
|
||
// Implementation of 'float as right-hand-side of Vec2::Mul' | ||
impl RhsOfVec2Mul<Vec2> for float { | ||
fn mul_vec2_by(&self, lhs: &Vec2) -> Vec2 { lhs.vmul(*self) } | ||
} | ||
|
||
// Usage with failing inference | ||
pub fn main() { | ||
let a = Vec2 { x: 3f, y: 4f }; | ||
|
||
// the following compiles and works properly | ||
let v1: Vec2 = a * 3f; | ||
io::println(fmt!("%f %f", v1.x, v1.y)); | ||
|
||
// the following compiles but v2 will not be Vec2 yet and | ||
// using it later will cause an error that the type of v2 | ||
// must be known | ||
let v2 = a * 3f; | ||
io::println(fmt!("%f %f", v2.x, v2.y)); // error regarding v2's type | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,49 @@ | ||
// Copyright 2013 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. | ||
|
||
// xfail-test | ||
|
||
enum Enum { | ||
Foo { foo: uint }, | ||
Bar { bar: uint } | ||
} | ||
|
||
fn fun1(e1: &Enum, e2: &Enum) -> uint { | ||
match (e1, e2) { | ||
(&Foo { foo: _ }, &Foo { foo: _ }) => 0, | ||
(&Foo { foo: _ }, &Bar { bar: _ }) => 1, | ||
(&Bar { bar: _ }, &Bar { bar: _ }) => 2, | ||
(&Bar { bar: _ }, &Foo { foo: _ }) => 3, | ||
} | ||
} | ||
|
||
fn fun2(e1: &Enum, e2: &Enum) -> uint { | ||
match (e1, e2) { | ||
(&Foo { foo: _ }, &Foo { foo: _ }) => 0, | ||
(&Foo { foo: _ }, _ ) => 1, | ||
(&Bar { bar: _ }, &Bar { bar: _ }) => 2, | ||
(&Bar { bar: _ }, _ ) => 3, | ||
} | ||
} | ||
|
||
pub fn main() { | ||
let foo = Foo { foo: 1 }; | ||
let bar = Bar { bar: 1 }; | ||
|
||
assert_eq!(fun1(&foo, &foo), 0); | ||
assert_eq!(fun1(&foo, &bar), 1); | ||
assert_eq!(fun1(&bar, &bar), 2); | ||
assert_eq!(fun1(&bar, &foo), 3); | ||
|
||
assert_eq!(fun2(&foo, &foo), 0); | ||
assert_eq!(fun2(&foo, &bar), 1); // fun2 returns 0 | ||
assert_eq!(fun2(&bar, &bar), 2); | ||
assert_eq!(fun2(&bar, &foo), 3); // fun2 returns 2 | ||
} |