Skip to content

Commit 483fb8f

Browse files
committed
Auto merge of rust-lang#30009 - apasel422:tests, r=alexcrichton
Closes rust-lang#25810. Closes rust-lang#29276. r? @alexcrichton
2 parents 2a0ce4a + c132736 commit 483fb8f

File tree

2 files changed

+48
-0
lines changed

2 files changed

+48
-0
lines changed

src/test/run-pass/issue-25810.rs

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
fn main() {
12+
let x = X(15);
13+
let y = x.foo();
14+
println!("{:?}",y);
15+
}
16+
17+
trait Foo {
18+
fn foo<'a>(&'a self) -> <&'a Self as Bar>::Output;
19+
}
20+
21+
trait Bar {
22+
type Output;
23+
}
24+
25+
struct X(i32);
26+
27+
impl<'a> Bar for &'a X {
28+
type Output = &'a i32;
29+
}
30+
31+
impl Foo for X {
32+
fn foo<'a>(&'a self) -> <&'a Self as Bar>::Output {
33+
&self.0
34+
}
35+
}

src/test/run-pass/issue-29276.rs

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
struct S([u8; { struct Z; 0 }]);
12+
13+
fn main() {}

0 commit comments

Comments
 (0)