Skip to content

Commit 038d7e6

Browse files
committed
Fix test fallouts
1 parent 753db88 commit 038d7e6

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

src/librustc_driver/test.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ impl<'a, 'tcx> Env<'a, 'tcx> {
206206

207207
ast::ItemEnum(..) | ast::ItemStruct(..) |
208208
ast::ItemTrait(..) | ast::ItemImpl(..) |
209-
ast::ItemMac(..) => {
209+
ast::ItemMac(..) | ast::ItemDefaultImpl(..) => {
210210
None
211211
}
212212

src/test/parse-fail/empty-impl-semicolon.rs

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

11-
impl Foo; //~ ERROR expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `;`
11+
impl Foo; //~ ERROR expected one of `(`, `+`, `..`, `::`, `<`, `for`, `where`, or `{`, found `;`

src/test/parse-fail/multitrait.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ struct S {
1313
}
1414

1515
impl Cmp, ToString for S {
16-
//~^ ERROR: expected one of `(`, `+`, `::`, `<`, `for`, `where`, or `{`, found `,`
16+
//~^ ERROR: expected one of `(`, `+`, `..`, `::`, `<`, `for`, `where`, or `{`, found `,`
1717
fn eq(&&other: S) { false }
1818
fn to_string(&self) -> String { "hi".to_string() }
1919
}

src/test/parse-fail/trait-bounds-not-on-impl.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,9 @@ trait Foo {
1313

1414
struct Bar;
1515

16-
impl Foo + Owned for Bar { //~ ERROR not a trait
16+
impl Foo + Owned for Bar {
17+
//~^ ERROR not a trait
18+
//~^^ ERROR expected one of `..`, `where`, or `{`, found `Bar`
1719
}
1820

1921
fn main() { }

src/test/pretty/default-trait-impl.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,9 @@
1212

1313
// pp-exact
1414

15-
trait MyTrait { }
15+
use std::marker::MarkerTrait;
16+
17+
trait MyTrait: MarkerTrait { }
1618

1719
impl MyTrait for .. { }
1820

0 commit comments

Comments
 (0)