Auto merge of #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.
This commit is contained in:
bors 2016-11-14 14:04:54 -08:00 committed by GitHub
commit bd6a54db74
4 changed files with 21 additions and 15 deletions

View File

@ -1,10 +0,0 @@
-include ../tools.mk
all:
$(RUSTC) m1.rs -C prefer-dynamic
$(RUSTC) m2.rs 2>&1 | grep "error\[E0046\]: not all trait items implemented, missing: .*"
$(RUSTC) m2.rs 2>&1 | grep " --> m2.rs:18:1"
$(RUSTC) m2.rs 2>&1 | grep " | ^ missing .CONSTANT., .Type., .method. in implementation"
$(RUSTC) m2.rs 2>&1 | grep " = note: .CONSTANT. from trait: .const CONSTANT: u32;."
$(RUSTC) m2.rs 2>&1 | grep " = note: .Type. from trait: .type Type;."
$(RUSTC) m2.rs 2>&1 | grep " = note: .method. from trait: .fn(&Self, std::string::String) -> <Self as m1::X>::Type."

View File

@ -9,9 +9,9 @@
// except according to those terms.
#![feature(associated_consts)]
#![crate_type = "dylib"]
pub trait X {
const CONSTANT: u32;
type Type;
fn method(&self, s: String) -> Self::Type;
const CONSTANT: u32;
type Type;
fn method(&self, s: String) -> Self::Type;
}

View File

@ -8,8 +8,10 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.
// aux-build:m1.rs
#![feature(associated_consts)]
#![crate_type = "dylib"]
extern crate m1;
struct X {

View File

@ -0,0 +1,14 @@
error: main function not found
error[E0046]: not all trait items implemented, missing: `CONSTANT`, `Type`, `method`
--> $DIR/m2.rs:20:1
|
20 | impl m1::X for X {
| ^ missing `CONSTANT`, `Type`, `method` in implementation
|
= note: `CONSTANT` from trait: `const CONSTANT: u32;`
= note: `Type` from trait: `type Type;`
= note: `method` from trait: `fn(&Self, std::string::String) -> <Self as m1::X>::Type`
error: aborting due to previous error