Skip to content

Commit 31d6716

Browse files
committed
Rollup merge of #26988 - frewsxcv:regression-tests, r=alexcrichton
"body": null,
2 parents 12899e7 + 7954096 commit 31d6716

File tree

5 files changed

+111
-0
lines changed

5 files changed

+111
-0
lines changed

src/test/compile-fail/issue-22312.rs

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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+
use std::ops::Index;
12+
13+
pub trait Array2D: Index<usize> {
14+
fn rows(&self) -> usize;
15+
fn columns(&self) -> usize;
16+
fn get<'a>(&'a self, y: usize, x: usize) -> Option<&'a <Self as Index<usize>>::Output> {
17+
if y >= self.rows() || x >= self.columns() {
18+
return None;
19+
}
20+
let i = y * self.columns() + x;
21+
let indexer = &(*self as &Index<usize, Output = <Self as Index<usize>>::Output>);
22+
//~^ERROR non-scalar cast
23+
Some(indexer.index(i))
24+
}
25+
}
26+
27+
fn main() {}
Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
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+
use std::ops::{Index};
12+
13+
trait Hierarchy {
14+
type Value;
15+
type ChildKey;
16+
type Children = Index<Self::ChildKey, Output=Hierarchy>;
17+
//~^ ERROR: the value of the associated type `ChildKey`
18+
//~^^ ERROR: the value of the associated type `Children`
19+
//~^^^ ERROR: the value of the associated type `Value`
20+
21+
fn data(&self) -> Option<(Self::Value, Self::Children)>;
22+
}
23+
24+
fn main() {}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
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+
pub struct C<AType: A> {a:AType}
12+
13+
pub trait A {
14+
type B = C<Self::anything_here_kills_it>;
15+
//~^ ERROR: associated type `anything_here_kills_it` not found for `Self`
16+
}
17+
18+
fn main() {}

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

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
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+
#![feature(unboxed_closures)]
12+
#![feature(core)]
13+
14+
struct Fun<F>(F);
15+
16+
impl<F, T> FnOnce<(T,)> for Fun<F> where F: Fn(T) -> T {
17+
type Output = T;
18+
19+
extern "rust-call" fn call_once(self, (t,): (T,)) -> T {
20+
(self.0)(t)
21+
}
22+
}
23+
24+
fn main() {
25+
let fun = Fun(|i: isize| i * 2);
26+
println!("{}", fun(3));
27+
}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+
pub trait Trait where Self::Out: std::fmt::Display {
12+
type Out;
13+
}
14+
15+
fn main() {}

0 commit comments

Comments
 (0)