Skip to content

Commit

Permalink
Auto merge of #26481 - nham:test-18655, r=arielb1
Browse files Browse the repository at this point in the history
These issues are fixed but still open.

Closes #18655.
Closes #18988.
  • Loading branch information
bors committed Jun 22, 2015
2 parents 31d9aee + 57a66f8 commit ba7f79e
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
31 changes: 31 additions & 0 deletions src/test/run-pass/issue-18655.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
// 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 Factory {
type Product;
fn create(&self) -> <Self as Factory>::Product;
}

impl Factory for f64 {
type Product = f64;
fn create(&self) -> f64 { *self * *self }
}

impl<A: Factory, B: Factory> Factory for (A, B) {
type Product = (<A as Factory>::Product, <B as Factory>::Product);
fn create(&self) -> (<A as Factory>::Product, <B as Factory>::Product) {
let (ref a, ref b) = *self;
(a.create(), b.create())
}
}

fn main() {
assert_eq!((16., 25.), (4., 5.).create());
}
19 changes: 19 additions & 0 deletions src/test/run-pass/issue-18988.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
// 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.

pub trait Foo : Send { }

pub struct MyFoo {
children: Vec<Box<Foo>>,
}

impl Foo for MyFoo { }

pub fn main() { }

0 comments on commit ba7f79e

Please sign in to comment.