Skip to content

Commit bd6a54d

Browse files
authored
Auto merge of rust-lang#37771 - alexcrichton:fix-nightlies, r=brson
test: Move missing-items to a ui test This test is failing on nightly for unknown reasons, and my best guess is a difference in grep versions which is interpreting symbols differently. For now let's just move this to a ui test and hope it fixes nightlies.
2 parents 2154588 + 3216024 commit bd6a54d

File tree

4 files changed

+21
-15
lines changed

4 files changed

+21
-15
lines changed

src/test/run-make/missing-items/Makefile

Lines changed: 0 additions & 10 deletions
This file was deleted.

src/test/run-make/missing-items/m1.rs renamed to src/test/ui/missing-items/auxiliary/m1.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
// except according to those terms.
1010

1111
#![feature(associated_consts)]
12-
#![crate_type = "dylib"]
12+
1313
pub trait X {
14-
const CONSTANT: u32;
15-
type Type;
16-
fn method(&self, s: String) -> Self::Type;
14+
const CONSTANT: u32;
15+
type Type;
16+
fn method(&self, s: String) -> Self::Type;
1717
}

src/test/run-make/missing-items/m2.rs renamed to src/test/ui/missing-items/m2.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,10 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11+
// aux-build:m1.rs
12+
1113
#![feature(associated_consts)]
12-
#![crate_type = "dylib"]
14+
1315
extern crate m1;
1416

1517
struct X {

src/test/ui/missing-items/m2.stderr

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: main function not found
2+
3+
error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method`
4+
--> $DIR/m2.rs:20:1
5+
|
6+
20 | impl m1::X for X {
7+
| ^ missing `CONSTANT`, `Type`, `method` in implementation
8+
|
9+
= note: `CONSTANT` from trait: `const CONSTANT: u32;`
10+
= note: `Type` from trait: `type Type;`
11+
= note: `method` from trait: `fn(&Self, std::string::String) -> <Self as m1::X>::Type`
12+
13+
error: aborting due to previous error
14+

0 commit comments

Comments
 (0)