Skip to content

Commit 64a17a0

Browse files
committed
remove unused imports and feature gate from tests
1 parent 1ef99f1 commit 64a17a0

File tree

4 files changed

+5
-10
lines changed

4 files changed

+5
-10
lines changed

src/libsyntax/config.rs

-3
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ use feature_gate::{
55
Features,
66
get_features,
77
GateIssue,
8-
emit_feature_err,
98
};
109
use {fold, attr};
1110
use ast;
@@ -94,8 +93,6 @@ impl<'a> StripUnconfigured<'a> {
9493
return vec![attr];
9594
}
9695

97-
let cfg_attr_span = attr.span;
98-
9996
let (cfg_predicate, expanded_attrs) = match attr.parse(self.sess, |parser| {
10097
parser.expect(&token::OpenDelim(token::Paren))?;
10198

src/test/ui/conditional-compilation/cfg-attr-multi-false.rs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
// compile-pass
55

66
#![warn(unused_must_use)]
7-
#![cfg_attr(stage0, feature(cfg_attr_multi))]
87

98
#[cfg_attr(any(), deprecated, must_use)]
109
struct Struct {}

src/test/ui/conditional-compilation/cfg-attr-multi-true.rs

-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
// compile-pass
66

77
#![warn(unused_must_use)]
8-
#![cfg_attr(stage0, feature(cfg_attr_multi))]
98

109
#[cfg_attr(all(), deprecated, must_use)]
1110
struct MustUseDeprecated {}

src/test/ui/conditional-compilation/cfg-attr-multi-true.stderr

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,31 @@
11
warning: use of deprecated item 'MustUseDeprecated'
2-
--> $DIR/cfg-attr-multi-true.rs:13:6
2+
--> $DIR/cfg-attr-multi-true.rs:12:6
33
|
44
LL | impl MustUseDeprecated { //~ warning: use of deprecated item
55
| ^^^^^^^^^^^^^^^^^
66
|
77
= note: #[warn(deprecated)] on by default
88

99
warning: use of deprecated item 'MustUseDeprecated'
10-
--> $DIR/cfg-attr-multi-true.rs:20:5
10+
--> $DIR/cfg-attr-multi-true.rs:19:5
1111
|
1212
LL | MustUseDeprecated::new(); //~ warning: use of deprecated item
1313
| ^^^^^^^^^^^^^^^^^^^^^^
1414

1515
warning: use of deprecated item 'MustUseDeprecated'
16-
--> $DIR/cfg-attr-multi-true.rs:14:17
16+
--> $DIR/cfg-attr-multi-true.rs:13:17
1717
|
1818
LL | fn new() -> MustUseDeprecated { //~ warning: use of deprecated item
1919
| ^^^^^^^^^^^^^^^^^
2020

2121
warning: use of deprecated item 'MustUseDeprecated'
22-
--> $DIR/cfg-attr-multi-true.rs:15:9
22+
--> $DIR/cfg-attr-multi-true.rs:14:9
2323
|
2424
LL | MustUseDeprecated {} //~ warning: use of deprecated item
2525
| ^^^^^^^^^^^^^^^^^
2626

2727
warning: unused `MustUseDeprecated` that must be used
28-
--> $DIR/cfg-attr-multi-true.rs:20:5
28+
--> $DIR/cfg-attr-multi-true.rs:19:5
2929
|
3030
LL | MustUseDeprecated::new(); //~ warning: use of deprecated item
3131
| ^^^^^^^^^^^^^^^^^^^^^^^^^

0 commit comments

Comments
 (0)