Skip to content

Commit a23064a

Browse files
authored
Auto merge of #35674 - ahmedcharles:rpass, r=alexcrichton
Fix compiletest so it respects warnings for run-pass.
2 parents 1194695 + 6961d26 commit a23064a

15 files changed

+30
-16
lines changed

src/test/run-pass-fulldeps/deprecated-derive.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
// except according to those terms.
1010

1111
#![feature(rustc_private)]
12+
#![allow(dead_code)]
1213

1314
extern crate serialize;
1415

src/test/run-pass-fulldeps/lint-group-plugin.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#![feature(plugin)]
1616
#![plugin(lint_group_plugin_test)]
17+
#![allow(dead_code)]
1718

1819
fn lintme() { } //~ WARNING item is named 'lintme'
1920
fn pleaselintme() { } //~ WARNING item is named 'pleaselintme'

src/test/run-pass-fulldeps/lint-plugin-cmdline-load.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
// ignore-pretty: Random space appears with the pretty test
1414
// compile-flags: -Z extra-plugins=lint_plugin_test
1515

16+
#![allow(dead_code)]
17+
1618
fn lintme() { } //~ WARNING item is named 'lintme'
1719

1820
#[allow(test_lint)]

src/test/run-pass-fulldeps/lint-plugin.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414

1515
#![feature(plugin)]
1616
#![plugin(lint_plugin_test)]
17+
#![allow(dead_code)]
1718

1819
fn lintme() { } //~ WARNING item is named 'lintme'
1920

src/test/run-pass/attr-before-view-item.rs

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

11-
// error-pattern:expected item
12-
1311
// pretty-expanded FIXME #23616
1412

1513
#![feature(custom_attribute, test)]

src/test/run-pass/attr-before-view-item2.rs

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

11-
// error-pattern:expected item
12-
1311
// pretty-expanded FIXME #23616
1412

1513
#![feature(custom_attribute, test)]

src/test/run-pass/deriving-meta-empty-trait-list.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
// option. This file may not be copied, modified, or distributed
1111
// except according to those terms.
1212

13+
#![allow(dead_code)]
1314

1415
#[derive] //~ WARNING empty trait list in `derive`
1516
struct Foo;

src/test/run-pass/enum-size-variance.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
//
1111
// ignore-pretty
1212

13-
#![deny(enum_size_variance)]
13+
#![warn(variant_size_differences)]
1414
#![allow(dead_code)]
1515

1616
enum Enum1 { }
@@ -21,8 +21,8 @@ enum Enum3 { D(isize), E, F }
2121

2222
enum Enum4 { H(isize), I(isize), J }
2323

24-
enum Enum5 { //~ ERROR three times larger
25-
L(isize, isize, isize, isize), //~ NOTE this variant is the largest
24+
enum Enum5 {
25+
L(isize, isize, isize, isize), //~ WARNING three times larger
2626
M(isize),
2727
N
2828
}
@@ -33,7 +33,7 @@ enum Enum6<T, U> {
3333
Q(isize)
3434
}
3535

36-
#[allow(enum_size_variance)]
36+
#[allow(variant_size_differences)]
3737
enum Enum7 {
3838
R(isize, isize, isize, isize),
3939
S(isize),

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

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

11+
#![allow(non_snake_case)]
12+
#![allow(dead_code)]
13+
#![allow(unused_variables)]
14+
1115
#[derive(Copy, Clone)]
1216
enum Foo {
1317
Bar,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ const FUNC: &'static Fn(&mut Foo) -> () = &Foo::x;
2222

2323
fn main() {
2424
let mut foo = Foo { a: 137 };
25-
FUNC(&mut foo); //~ ERROR bad
25+
FUNC(&mut foo);
2626
assert_eq!(foo.a, 5);
2727
}

0 commit comments

Comments
 (0)