Skip to content

Commit dd1491c

Browse files
nikomatsakisflodiebold
nikomatsakis
authored and
flodiebold
committed
WIP: update tests to pass -- not complete
1 parent 688946d commit dd1491c

File tree

5 files changed

+51
-33
lines changed

5 files changed

+51
-33
lines changed

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

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn change_callee_function() {
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
4141
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4242
#[rustc_clean(label="HirBody", cfg="cfail3")]
43-
#[rustc_metadata_dirty(cfg="cfail2")]
43+
#[rustc_metadata_clean(cfg="cfail2")]
4444
#[rustc_metadata_clean(cfg="cfail3")]
4545
pub fn change_callee_function() {
4646
callee2(1, 2)
@@ -59,7 +59,7 @@ pub fn change_argument_function() {
5959
#[rustc_clean(label="Hir", cfg="cfail3")]
6060
#[rustc_dirty(label="HirBody", cfg="cfail2")]
6161
#[rustc_clean(label="HirBody", cfg="cfail3")]
62-
#[rustc_metadata_dirty(cfg="cfail2")]
62+
#[rustc_metadata_clean(cfg="cfail2")]
6363
#[rustc_metadata_clean(cfg="cfail3")]
6464
pub fn change_argument_function() {
6565
callee1(1, 3)
@@ -78,7 +78,7 @@ mod change_callee_indirectly_function {
7878
#[rustc_clean(label="Hir", cfg="cfail3")]
7979
#[rustc_dirty(label="HirBody", cfg="cfail2")]
8080
#[rustc_clean(label="HirBody", cfg="cfail3")]
81-
#[rustc_metadata_dirty(cfg="cfail2")]
81+
#[rustc_metadata_clean(cfg="cfail2")]
8282
#[rustc_metadata_clean(cfg="cfail3")]
8383
pub fn change_callee_indirectly_function() {
8484
callee(1, 2)
@@ -104,7 +104,7 @@ pub fn change_callee_method() {
104104
#[rustc_clean(label="Hir", cfg="cfail3")]
105105
#[rustc_dirty(label="HirBody", cfg="cfail2")]
106106
#[rustc_clean(label="HirBody", cfg="cfail3")]
107-
#[rustc_metadata_dirty(cfg="cfail2")]
107+
#[rustc_metadata_clean(cfg="cfail2")]
108108
#[rustc_metadata_clean(cfg="cfail3")]
109109
pub fn change_callee_method() {
110110
let s = Struct;
@@ -125,7 +125,7 @@ pub fn change_argument_method() {
125125
#[rustc_clean(label="Hir", cfg="cfail3")]
126126
#[rustc_dirty(label="HirBody", cfg="cfail2")]
127127
#[rustc_clean(label="HirBody", cfg="cfail3")]
128-
#[rustc_metadata_dirty(cfg="cfail2")]
128+
#[rustc_metadata_clean(cfg="cfail2")]
129129
#[rustc_metadata_clean(cfg="cfail3")]
130130
pub fn change_argument_method() {
131131
let s = Struct;
@@ -146,7 +146,7 @@ pub fn change_ufcs_callee_method() {
146146
#[rustc_clean(label="Hir", cfg="cfail3")]
147147
#[rustc_dirty(label="HirBody", cfg="cfail2")]
148148
#[rustc_clean(label="HirBody", cfg="cfail3")]
149-
#[rustc_metadata_dirty(cfg="cfail2")]
149+
#[rustc_metadata_clean(cfg="cfail2")]
150150
#[rustc_metadata_clean(cfg="cfail3")]
151151
pub fn change_ufcs_callee_method() {
152152
let s = Struct;
@@ -167,7 +167,7 @@ pub fn change_argument_method_ufcs() {
167167
#[rustc_clean(label="Hir", cfg="cfail3")]
168168
#[rustc_dirty(label="HirBody", cfg="cfail2")]
169169
#[rustc_clean(label="HirBody", cfg="cfail3")]
170-
#[rustc_metadata_dirty(cfg="cfail2")]
170+
#[rustc_metadata_clean(cfg="cfail2")]
171171
#[rustc_metadata_clean(cfg="cfail3")]
172172
pub fn change_argument_method_ufcs() {
173173
let s = Struct;
@@ -188,7 +188,7 @@ pub fn change_to_ufcs() {
188188
#[rustc_clean(label="Hir", cfg="cfail3")]
189189
#[rustc_dirty(label="HirBody", cfg="cfail2")]
190190
#[rustc_clean(label="HirBody", cfg="cfail3")]
191-
#[rustc_metadata_dirty(cfg="cfail2")]
191+
#[rustc_metadata_clean(cfg="cfail2")]
192192
#[rustc_metadata_clean(cfg="cfail3")]
193193
pub fn change_to_ufcs() {
194194
let s = Struct;
@@ -212,7 +212,7 @@ mod change_ufcs_callee_indirectly {
212212
#[rustc_clean(label="Hir", cfg="cfail3")]
213213
#[rustc_dirty(label="HirBody", cfg="cfail2")]
214214
#[rustc_clean(label="HirBody", cfg="cfail3")]
215-
#[rustc_metadata_dirty(cfg="cfail2")]
215+
#[rustc_metadata_clean(cfg="cfail2")]
216216
#[rustc_metadata_clean(cfg="cfail3")]
217217
pub fn change_ufcs_callee_indirectly() {
218218
let s = Struct;

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

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@ fn change_loop_body() {
3838
#[cfg(not(cfail1))]
3939
#[rustc_dirty(label="Hir", cfg="cfail2")]
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
41+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
42+
#[rustc_clean(label="HirBody", cfg="cfail3")]
4143
#[rustc_metadata_dirty(cfg="cfail2")]
4244
#[rustc_metadata_clean(cfg="cfail3")]
4345
fn change_loop_body() {
@@ -63,6 +65,8 @@ fn change_iteration_variable_name() {
6365
#[cfg(not(cfail1))]
6466
#[rustc_dirty(label="Hir", cfg="cfail2")]
6567
#[rustc_clean(label="Hir", cfg="cfail3")]
68+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
69+
#[rustc_clean(label="HirBody", cfg="cfail3")]
6670
#[rustc_metadata_dirty(cfg="cfail2")]
6771
#[rustc_metadata_clean(cfg="cfail3")]
6872
fn change_iteration_variable_name() {
@@ -88,6 +92,8 @@ fn change_iteration_variable_pattern() {
8892
#[cfg(not(cfail1))]
8993
#[rustc_dirty(label="Hir", cfg="cfail2")]
9094
#[rustc_clean(label="Hir", cfg="cfail3")]
95+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
96+
#[rustc_clean(label="HirBody", cfg="cfail3")]
9197
#[rustc_metadata_dirty(cfg="cfail2")]
9298
#[rustc_metadata_clean(cfg="cfail3")]
9399
fn change_iteration_variable_pattern() {
@@ -113,6 +119,8 @@ fn change_iterable() {
113119
#[cfg(not(cfail1))]
114120
#[rustc_dirty(label="Hir", cfg="cfail2")]
115121
#[rustc_clean(label="Hir", cfg="cfail3")]
122+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
123+
#[rustc_clean(label="HirBody", cfg="cfail3")]
116124
#[rustc_metadata_dirty(cfg="cfail2")]
117125
#[rustc_metadata_clean(cfg="cfail3")]
118126
fn change_iterable() {
@@ -137,6 +145,8 @@ fn add_break() {
137145
#[cfg(not(cfail1))]
138146
#[rustc_dirty(label="Hir", cfg="cfail2")]
139147
#[rustc_clean(label="Hir", cfg="cfail3")]
148+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
149+
#[rustc_clean(label="HirBody", cfg="cfail3")]
140150
#[rustc_metadata_dirty(cfg="cfail2")]
141151
#[rustc_metadata_clean(cfg="cfail3")]
142152
fn add_break() {

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

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ pub fn change_condition(x: bool) -> u32 {
4040
#[rustc_clean(label="Hir", cfg="cfail3")]
4141
#[rustc_dirty(label="HirBody", cfg="cfail2")]
4242
#[rustc_clean(label="HirBody", cfg="cfail3")]
43-
#[rustc_metadata_dirty(cfg="cfail2")]
43+
#[rustc_metadata_clean(cfg="cfail2")]
4444
#[rustc_metadata_clean(cfg="cfail3")]
4545
pub fn change_condition(x: bool) -> u32 {
4646
if !x {
@@ -65,7 +65,7 @@ pub fn change_then_branch(x: bool) -> u32 {
6565
#[rustc_clean(label="Hir", cfg="cfail3")]
6666
#[rustc_dirty(label="HirBody", cfg="cfail2")]
6767
#[rustc_clean(label="HirBody", cfg="cfail3")]
68-
#[rustc_metadata_dirty(cfg="cfail2")]
68+
#[rustc_metadata_clean(cfg="cfail2")]
6969
#[rustc_metadata_clean(cfg="cfail3")]
7070
pub fn change_then_branch(x: bool) -> u32 {
7171
if x {
@@ -92,7 +92,7 @@ pub fn change_else_branch(x: bool) -> u32 {
9292
#[rustc_clean(label="Hir", cfg="cfail3")]
9393
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9494
#[rustc_clean(label="HirBody", cfg="cfail3")]
95-
#[rustc_metadata_dirty(cfg="cfail2")]
95+
#[rustc_metadata_clean(cfg="cfail2")]
9696
#[rustc_metadata_clean(cfg="cfail3")]
9797
pub fn change_else_branch(x: bool) -> u32 {
9898
if x {
@@ -121,7 +121,7 @@ pub fn add_else_branch(x: bool) -> u32 {
121121
#[rustc_clean(label="Hir", cfg="cfail3")]
122122
#[rustc_dirty(label="HirBody", cfg="cfail2")]
123123
#[rustc_clean(label="HirBody", cfg="cfail3")]
124-
#[rustc_metadata_dirty(cfg="cfail2")]
124+
#[rustc_metadata_clean(cfg="cfail2")]
125125
#[rustc_metadata_clean(cfg="cfail3")]
126126
pub fn add_else_branch(x: bool) -> u32 {
127127
let mut ret = 1;
@@ -151,7 +151,7 @@ pub fn change_condition_if_let(x: Option<u32>) -> u32 {
151151
#[rustc_clean(label="Hir", cfg="cfail3")]
152152
#[rustc_dirty(label="HirBody", cfg="cfail2")]
153153
#[rustc_clean(label="HirBody", cfg="cfail3")]
154-
#[rustc_metadata_dirty(cfg="cfail2")]
154+
#[rustc_metadata_clean(cfg="cfail2")]
155155
#[rustc_metadata_clean(cfg="cfail3")]
156156
pub fn change_condition_if_let(x: Option<u32>) -> u32 {
157157
if let Some(_) = x {
@@ -178,7 +178,7 @@ pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
178178
#[rustc_clean(label="Hir", cfg="cfail3")]
179179
#[rustc_dirty(label="HirBody", cfg="cfail2")]
180180
#[rustc_clean(label="HirBody", cfg="cfail3")]
181-
#[rustc_metadata_dirty(cfg="cfail2")]
181+
#[rustc_metadata_clean(cfg="cfail2")]
182182
#[rustc_metadata_clean(cfg="cfail3")]
183183
pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
184184
if let Some(x) = x {
@@ -205,7 +205,7 @@ pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
205205
#[rustc_clean(label="Hir", cfg="cfail3")]
206206
#[rustc_dirty(label="HirBody", cfg="cfail2")]
207207
#[rustc_clean(label="HirBody", cfg="cfail3")]
208-
#[rustc_metadata_dirty(cfg="cfail2")]
208+
#[rustc_metadata_clean(cfg="cfail2")]
209209
#[rustc_metadata_clean(cfg="cfail3")]
210210
pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
211211
if let Some(x) = x {
@@ -234,7 +234,7 @@ pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
234234
#[rustc_clean(label="Hir", cfg="cfail3")]
235235
#[rustc_dirty(label="HirBody", cfg="cfail2")]
236236
#[rustc_clean(label="HirBody", cfg="cfail3")]
237-
#[rustc_metadata_dirty(cfg="cfail2")]
237+
#[rustc_metadata_clean(cfg="cfail2")]
238238
#[rustc_metadata_clean(cfg="cfail3")]
239239
pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
240240
let mut ret = 1;

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ pub fn change_name() {
3636
#[rustc_clean(label="Hir", cfg="cfail3")]
3737
#[rustc_dirty(label="HirBody", cfg="cfail2")]
3838
#[rustc_clean(label="HirBody", cfg="cfail3")]
39-
#[rustc_metadata_dirty(cfg="cfail2")]
39+
#[rustc_metadata_clean(cfg="cfail2")]
4040
#[rustc_metadata_clean(cfg="cfail3")]
4141
pub fn change_name() {
4242
let _y = 2u64;
@@ -55,7 +55,7 @@ pub fn add_type() {
5555
#[rustc_clean(label="Hir", cfg="cfail3")]
5656
#[rustc_dirty(label="HirBody", cfg="cfail2")]
5757
#[rustc_clean(label="HirBody", cfg="cfail3")]
58-
#[rustc_metadata_dirty(cfg="cfail2")]
58+
#[rustc_metadata_clean(cfg="cfail2")]
5959
#[rustc_metadata_clean(cfg="cfail3")]
6060
pub fn add_type() {
6161
let _x: u32 = 2u32;
@@ -74,7 +74,7 @@ pub fn change_type() {
7474
#[rustc_clean(label="Hir", cfg="cfail3")]
7575
#[rustc_dirty(label="HirBody", cfg="cfail2")]
7676
#[rustc_clean(label="HirBody", cfg="cfail3")]
77-
#[rustc_metadata_dirty(cfg="cfail2")]
77+
#[rustc_metadata_clean(cfg="cfail2")]
7878
#[rustc_metadata_clean(cfg="cfail3")]
7979
pub fn change_type() {
8080
let _x: u8 = 2;
@@ -93,7 +93,7 @@ pub fn change_mutability_of_reference_type() {
9393
#[rustc_clean(label="Hir", cfg="cfail3")]
9494
#[rustc_dirty(label="HirBody", cfg="cfail2")]
9595
#[rustc_clean(label="HirBody", cfg="cfail3")]
96-
#[rustc_metadata_dirty(cfg="cfail2")]
96+
#[rustc_metadata_clean(cfg="cfail2")]
9797
#[rustc_metadata_clean(cfg="cfail3")]
9898
pub fn change_mutability_of_reference_type() {
9999
let _x: &mut u64;
@@ -112,7 +112,7 @@ pub fn change_mutability_of_slot() {
112112
#[rustc_clean(label="Hir", cfg="cfail3")]
113113
#[rustc_dirty(label="HirBody", cfg="cfail2")]
114114
#[rustc_clean(label="HirBody", cfg="cfail3")]
115-
#[rustc_metadata_dirty(cfg="cfail2")]
115+
#[rustc_metadata_clean(cfg="cfail2")]
116116
#[rustc_metadata_clean(cfg="cfail3")]
117117
pub fn change_mutability_of_slot() {
118118
let _x: u64 = 0;
@@ -131,7 +131,7 @@ pub fn change_simple_binding_to_pattern() {
131131
#[rustc_clean(label="Hir", cfg="cfail3")]
132132
#[rustc_dirty(label="HirBody", cfg="cfail2")]
133133
#[rustc_clean(label="HirBody", cfg="cfail3")]
134-
#[rustc_metadata_dirty(cfg="cfail2")]
134+
#[rustc_metadata_clean(cfg="cfail2")]
135135
#[rustc_metadata_clean(cfg="cfail3")]
136136
pub fn change_simple_binding_to_pattern() {
137137
let (_a, _b) = (0u8, 'x');
@@ -150,7 +150,7 @@ pub fn change_name_in_pattern() {
150150
#[rustc_clean(label="Hir", cfg="cfail3")]
151151
#[rustc_dirty(label="HirBody", cfg="cfail2")]
152152
#[rustc_clean(label="HirBody", cfg="cfail3")]
153-
#[rustc_metadata_dirty(cfg="cfail2")]
153+
#[rustc_metadata_clean(cfg="cfail2")]
154154
#[rustc_metadata_clean(cfg="cfail3")]
155155
pub fn change_name_in_pattern() {
156156
let (_a, _c) = (1u8, 'y');
@@ -169,7 +169,7 @@ pub fn add_ref_in_pattern() {
169169
#[rustc_clean(label="Hir", cfg="cfail3")]
170170
#[rustc_dirty(label="HirBody", cfg="cfail2")]
171171
#[rustc_clean(label="HirBody", cfg="cfail3")]
172-
#[rustc_metadata_dirty(cfg="cfail2")]
172+
#[rustc_metadata_clean(cfg="cfail2")]
173173
#[rustc_metadata_clean(cfg="cfail3")]
174174
pub fn add_ref_in_pattern() {
175175
let (ref _a, _b) = (1u8, 'y');
@@ -188,7 +188,7 @@ pub fn add_amp_in_pattern() {
188188
#[rustc_clean(label="Hir", cfg="cfail3")]
189189
#[rustc_dirty(label="HirBody", cfg="cfail2")]
190190
#[rustc_clean(label="HirBody", cfg="cfail3")]
191-
#[rustc_metadata_dirty(cfg="cfail2")]
191+
#[rustc_metadata_clean(cfg="cfail2")]
192192
#[rustc_metadata_clean(cfg="cfail3")]
193193
pub fn add_amp_in_pattern() {
194194
let (&_a, _b) = (&1u8, 'y');
@@ -207,7 +207,7 @@ pub fn change_mutability_of_binding_in_pattern() {
207207
#[rustc_clean(label="Hir", cfg="cfail3")]
208208
#[rustc_dirty(label="HirBody", cfg="cfail2")]
209209
#[rustc_clean(label="HirBody", cfg="cfail3")]
210-
#[rustc_metadata_dirty(cfg="cfail2")]
210+
#[rustc_metadata_clean(cfg="cfail2")]
211211
#[rustc_metadata_clean(cfg="cfail3")]
212212
pub fn change_mutability_of_binding_in_pattern() {
213213
let (mut _a, _b) = (99u8, 'q');
@@ -226,7 +226,7 @@ pub fn add_initializer() {
226226
#[rustc_clean(label="Hir", cfg="cfail3")]
227227
#[rustc_dirty(label="HirBody", cfg="cfail2")]
228228
#[rustc_clean(label="HirBody", cfg="cfail3")]
229-
#[rustc_metadata_dirty(cfg="cfail2")]
229+
#[rustc_metadata_clean(cfg="cfail2")]
230230
#[rustc_metadata_clean(cfg="cfail3")]
231231
pub fn add_initializer() {
232232
let _x: i16 = 3i16;
@@ -245,7 +245,7 @@ pub fn change_initializer() {
245245
#[rustc_clean(label="Hir", cfg="cfail3")]
246246
#[rustc_dirty(label="HirBody", cfg="cfail2")]
247247
#[rustc_clean(label="HirBody", cfg="cfail3")]
248-
#[rustc_metadata_dirty(cfg="cfail2")]
248+
#[rustc_metadata_clean(cfg="cfail2")]
249249
#[rustc_metadata_clean(cfg="cfail3")]
250250
pub fn change_initializer() {
251251
let _x = 5u16;

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

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@ pub fn const_negation() -> i32 {
3434
#[cfg(not(cfail1))]
3535
#[rustc_dirty(label="Hir", cfg="cfails2")]
3636
#[rustc_clean(label="Hir", cfg="cfails3")]
37-
#[rustc_metadata_dirty(cfg="cfail2")]
37+
#[rustc_dirty(label="HirBody", cfg="cfails2")]
38+
#[rustc_clean(label="HirBody", cfg="cfails3")]
39+
#[rustc_metadata_clean(cfg="cfail2")]
3840
#[rustc_metadata_clean(cfg="cfail3")]
3941
pub fn const_negation() -> i32 {
4042
-1
@@ -51,7 +53,9 @@ pub fn const_bitwise_not() -> i32 {
5153
#[cfg(not(cfail1))]
5254
#[rustc_dirty(label="Hir", cfg="cfails2")]
5355
#[rustc_clean(label="Hir", cfg="cfails3")]
54-
#[rustc_metadata_dirty(cfg="cfail2")]
56+
#[rustc_dirty(label="HirBody", cfg="cfails2")]
57+
#[rustc_clean(label="HirBody", cfg="cfails3")]
58+
#[rustc_metadata_clean(cfg="cfail2")]
5559
#[rustc_metadata_clean(cfg="cfail3")]
5660
pub fn const_bitwise_not() -> i32 {
5761
!99
@@ -68,7 +72,9 @@ pub fn var_negation(x: i32, y: i32) -> i32 {
6872
#[cfg(not(cfail1))]
6973
#[rustc_dirty(label="Hir", cfg="cfails2")]
7074
#[rustc_clean(label="Hir", cfg="cfails3")]
71-
#[rustc_metadata_dirty(cfg="cfail2")]
75+
#[rustc_dirty(label="HirBody", cfg="cfails2")]
76+
#[rustc_clean(label="HirBody", cfg="cfails3")]
77+
#[rustc_metadata_clean(cfg="cfail2")]
7278
#[rustc_metadata_clean(cfg="cfail3")]
7379
pub fn var_negation(x: i32, y: i32) -> i32 {
7480
-y
@@ -85,7 +91,9 @@ pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
8591
#[cfg(not(cfail1))]
8692
#[rustc_dirty(label="Hir", cfg="cfails2")]
8793
#[rustc_clean(label="Hir", cfg="cfails3")]
88-
#[rustc_metadata_dirty(cfg="cfail2")]
94+
#[rustc_dirty(label="HirBody", cfg="cfails2")]
95+
#[rustc_clean(label="HirBody", cfg="cfails3")]
96+
#[rustc_metadata_clean(cfg="cfail2")]
8997
#[rustc_metadata_clean(cfg="cfail3")]
9098
pub fn var_bitwise_not(x: i32, y: i32) -> i32 {
9199
!y

0 commit comments

Comments
 (0)