Skip to content

Commit 7a99da1

Browse files
JakobDegenJakobDegen
committed
Switch incremental/hashes tests to all use optimizations.
1 parent 8d6d8f0 commit 7a99da1

26 files changed

+39
-39
lines changed

‎src/test/incremental/hashes/call_expressions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/closure_expressions.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph -Zmir-opt-level=0
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans
@@ -63,9 +63,9 @@ pub fn change_parameter_pattern() {
6363
}
6464

6565
#[cfg(not(any(cfail1,cfail4)))]
66-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck, optimized_mir")]
66+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes, typeck")]
6767
#[rustc_clean(cfg="cfail3")]
68-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, typeck, optimized_mir")]
68+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, typeck")]
6969
#[rustc_clean(cfg="cfail6")]
7070
pub fn change_parameter_pattern() {
7171
let _ = |(x,): (u32,)| x;
@@ -82,7 +82,7 @@ pub fn add_move() {
8282
#[cfg(not(any(cfail1,cfail4)))]
8383
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
8484
#[rustc_clean(cfg="cfail3")]
85-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes, optimized_mir")]
85+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
8686
#[rustc_clean(cfg="cfail6")]
8787
pub fn add_move() {
8888
let _ = move || 1;

‎src/test/incremental/hashes/consts.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111

1212
#![allow(warnings)]
1313
#![feature(rustc_attrs)]

‎src/test/incremental/hashes/enum_constructors.rs

+11-11
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph -Zmir-opt-level=0
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans
@@ -106,9 +106,9 @@ pub fn change_constructor_path_struct_like() {
106106
}
107107

108108
#[cfg(not(any(cfail1,cfail4)))]
109-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir,typeck")]
109+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,typeck")]
110110
#[rustc_clean(cfg="cfail3")]
111-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir,typeck")]
111+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,typeck")]
112112
#[rustc_clean(cfg="cfail6")]
113113
pub fn change_constructor_path_struct_like() {
114114
let _ = Enum2::Struct {
@@ -131,9 +131,9 @@ pub fn change_constructor_variant_struct_like() {
131131
}
132132

133133
#[cfg(not(any(cfail1,cfail4)))]
134-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
134+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
135135
#[rustc_clean(cfg="cfail3")]
136-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
136+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
137137
#[rustc_clean(cfg="cfail6")]
138138
pub fn change_constructor_variant_struct_like() {
139139
let _ = Enum2::Struct2 {
@@ -221,12 +221,12 @@ pub fn change_constructor_path_tuple_like() {
221221
#[cfg(not(any(cfail1,cfail4)))]
222222
#[rustc_clean(
223223
cfg="cfail2",
224-
except="hir_owner_nodes,optimized_mir,typeck"
224+
except="hir_owner_nodes,typeck"
225225
)]
226226
#[rustc_clean(cfg="cfail3")]
227227
#[rustc_clean(
228228
cfg="cfail5",
229-
except="hir_owner_nodes,optimized_mir,typeck"
229+
except="hir_owner_nodes,typeck"
230230
)]
231231
#[rustc_clean(cfg="cfail6")]
232232
pub fn change_constructor_path_tuple_like() {
@@ -244,12 +244,12 @@ pub fn change_constructor_variant_tuple_like() {
244244
#[cfg(not(any(cfail1,cfail4)))]
245245
#[rustc_clean(
246246
cfg="cfail2",
247-
except="hir_owner_nodes,optimized_mir,typeck"
247+
except="hir_owner_nodes,typeck"
248248
)]
249249
#[rustc_clean(cfg="cfail3")]
250250
#[rustc_clean(
251251
cfg="cfail5",
252-
except="hir_owner_nodes,optimized_mir,typeck"
252+
except="hir_owner_nodes,typeck"
253253
)]
254254
#[rustc_clean(cfg="cfail6")]
255255
pub fn change_constructor_variant_tuple_like() {
@@ -337,9 +337,9 @@ pub fn change_constructor_variant_c_like() {
337337
}
338338

339339
#[cfg(not(any(cfail1,cfail4)))]
340-
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes,optimized_mir")]
340+
#[rustc_clean(cfg="cfail2", except="hir_owner_nodes")]
341341
#[rustc_clean(cfg="cfail3")]
342-
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes,optimized_mir")]
342+
#[rustc_clean(cfg="cfail5", except="hir_owner_nodes")]
343343
#[rustc_clean(cfg="cfail6")]
344344
pub fn change_constructor_variant_c_like() {
345345
let _x = Clike::C;

‎src/test/incremental/hashes/enum_defs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// build-pass (FIXME(62277): could be check-pass?)
1414
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
15-
// compile-flags: -Z query-dep-graph
15+
// compile-flags: -Z query-dep-graph -O
1616
// [cfail1]compile-flags: -Zincremental-ignore-spans
1717
// [cfail2]compile-flags: -Zincremental-ignore-spans
1818
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/exported_vs_not.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
// build-pass (FIXME(62277): could be check-pass?)
22
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
3-
// compile-flags: -Z query-dep-graph
3+
// compile-flags: -Z query-dep-graph -O
44
// [cfail1]compile-flags: -Zincremental-ignore-spans
55
// [cfail2]compile-flags: -Zincremental-ignore-spans
66
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/extern_mods.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/for_loops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/function_interfaces.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/if_expressions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/indexing_expressions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/inherent_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/inline_asm.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// needs-asm-support
1212
// [cfail1]compile-flags: -Zincremental-ignore-spans
1313
// [cfail2]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/let_expressions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/loop_expressions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/match_expressions.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/panic_exprs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
// build-pass (FIXME(62277): could be check-pass?)
1212
// revisions: cfail1 cfail2 cfail3
13-
// compile-flags: -Z query-dep-graph -C debug-assertions
13+
// compile-flags: -Z query-dep-graph -C debug-assertions -O
1414

1515
#![allow(warnings)]
1616
#![feature(rustc_attrs)]

‎src/test/incremental/hashes/statics.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/struct_constructors.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/struct_defs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// build-pass (FIXME(62277): could be check-pass?)
1414
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
15-
// compile-flags: -Z query-dep-graph
15+
// compile-flags: -Z query-dep-graph -O
1616
// [cfail1]compile-flags: -Zincremental-ignore-spans
1717
// [cfail2]compile-flags: -Zincremental-ignore-spans
1818
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/trait_defs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// build-pass (FIXME(62277): could be check-pass?)
1414
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
15-
// compile-flags: -Z query-dep-graph
15+
// compile-flags: -Z query-dep-graph -O
1616
// [cfail1]compile-flags: -Zincremental-ignore-spans
1717
// [cfail2]compile-flags: -Zincremental-ignore-spans
1818
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/trait_impls.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/type_defs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
// build-pass (FIXME(62277): could be check-pass?)
1414
// revisions: cfail1 cfail2 cfail3
15-
// compile-flags: -Z query-dep-graph
15+
// compile-flags: -Z query-dep-graph -O
1616

1717
#![allow(warnings)]
1818
#![feature(rustc_attrs)]

‎src/test/incremental/hashes/unary_and_binary_exprs.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/while_let_loops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

‎src/test/incremental/hashes/while_loops.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
// build-pass (FIXME(62277): could be check-pass?)
99
// revisions: cfail1 cfail2 cfail3 cfail4 cfail5 cfail6
10-
// compile-flags: -Z query-dep-graph
10+
// compile-flags: -Z query-dep-graph -O
1111
// [cfail1]compile-flags: -Zincremental-ignore-spans
1212
// [cfail2]compile-flags: -Zincremental-ignore-spans
1313
// [cfail3]compile-flags: -Zincremental-ignore-spans

0 commit comments

Comments
 (0)