Skip to content

Commit 7b02129

Browse files
flodieboldflodiebold
committed
Fix new tests
1 parent fb968d2 commit 7b02129

File tree

6 files changed

+184
-56
lines changed

6 files changed

+184
-56
lines changed

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

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ pub fn change_callee_function() {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_dirty(label="Hir", cfg="cfail2")]
39+
#[rustc_clean(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
pub fn change_callee_function() {
@@ -53,8 +55,10 @@ pub fn change_argument_function() {
5355
}
5456

5557
#[cfg(not(cfail1))]
56-
#[rustc_dirty(label="Hir", cfg="cfail2")]
58+
#[rustc_clean(label="Hir", cfg="cfail2")]
5759
#[rustc_clean(label="Hir", cfg="cfail3")]
60+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
61+
#[rustc_clean(label="HirBody", cfg="cfail3")]
5862
#[rustc_metadata_dirty(cfg="cfail2")]
5963
#[rustc_metadata_clean(cfg="cfail3")]
6064
pub fn change_argument_function() {
@@ -70,8 +74,10 @@ mod change_callee_indirectly_function {
7074
#[cfg(not(cfail1))]
7175
use super::callee2 as callee;
7276

73-
#[rustc_dirty(label="Hir", cfg="cfail2")]
77+
#[rustc_clean(label="Hir", cfg="cfail2")]
7478
#[rustc_clean(label="Hir", cfg="cfail3")]
79+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
80+
#[rustc_clean(label="HirBody", cfg="cfail3")]
7581
#[rustc_metadata_dirty(cfg="cfail2")]
7682
#[rustc_metadata_clean(cfg="cfail3")]
7783
pub fn change_callee_indirectly_function() {
@@ -94,8 +100,10 @@ pub fn change_callee_method() {
94100
}
95101

96102
#[cfg(not(cfail1))]
97-
#[rustc_dirty(label="Hir", cfg="cfail2")]
103+
#[rustc_clean(label="Hir", cfg="cfail2")]
98104
#[rustc_clean(label="Hir", cfg="cfail3")]
105+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
106+
#[rustc_clean(label="HirBody", cfg="cfail3")]
99107
#[rustc_metadata_dirty(cfg="cfail2")]
100108
#[rustc_metadata_clean(cfg="cfail3")]
101109
pub fn change_callee_method() {
@@ -113,8 +121,10 @@ pub fn change_argument_method() {
113121
}
114122

115123
#[cfg(not(cfail1))]
116-
#[rustc_dirty(label="Hir", cfg="cfail2")]
124+
#[rustc_clean(label="Hir", cfg="cfail2")]
117125
#[rustc_clean(label="Hir", cfg="cfail3")]
126+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
127+
#[rustc_clean(label="HirBody", cfg="cfail3")]
118128
#[rustc_metadata_dirty(cfg="cfail2")]
119129
#[rustc_metadata_clean(cfg="cfail3")]
120130
pub fn change_argument_method() {
@@ -132,8 +142,10 @@ pub fn change_ufcs_callee_method() {
132142
}
133143

134144
#[cfg(not(cfail1))]
135-
#[rustc_dirty(label="Hir", cfg="cfail2")]
145+
#[rustc_clean(label="Hir", cfg="cfail2")]
136146
#[rustc_clean(label="Hir", cfg="cfail3")]
147+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
148+
#[rustc_clean(label="HirBody", cfg="cfail3")]
137149
#[rustc_metadata_dirty(cfg="cfail2")]
138150
#[rustc_metadata_clean(cfg="cfail3")]
139151
pub fn change_ufcs_callee_method() {
@@ -151,8 +163,10 @@ pub fn change_argument_method_ufcs() {
151163
}
152164

153165
#[cfg(not(cfail1))]
154-
#[rustc_dirty(label="Hir", cfg="cfail2")]
166+
#[rustc_clean(label="Hir", cfg="cfail2")]
155167
#[rustc_clean(label="Hir", cfg="cfail3")]
168+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
169+
#[rustc_clean(label="HirBody", cfg="cfail3")]
156170
#[rustc_metadata_dirty(cfg="cfail2")]
157171
#[rustc_metadata_clean(cfg="cfail3")]
158172
pub fn change_argument_method_ufcs() {
@@ -170,8 +184,10 @@ pub fn change_to_ufcs() {
170184
}
171185

172186
#[cfg(not(cfail1))]
173-
#[rustc_dirty(label="Hir", cfg="cfail2")]
187+
#[rustc_clean(label="Hir", cfg="cfail2")]
174188
#[rustc_clean(label="Hir", cfg="cfail3")]
189+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
190+
#[rustc_clean(label="HirBody", cfg="cfail3")]
175191
#[rustc_metadata_dirty(cfg="cfail2")]
176192
#[rustc_metadata_clean(cfg="cfail3")]
177193
pub fn change_to_ufcs() {
@@ -192,8 +208,10 @@ mod change_ufcs_callee_indirectly {
192208
#[cfg(not(cfail1))]
193209
use super::Struct2 as Struct;
194210

195-
#[rustc_dirty(label="Hir", cfg="cfail2")]
211+
#[rustc_clean(label="Hir", cfg="cfail2")]
196212
#[rustc_clean(label="Hir", cfg="cfail3")]
213+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
214+
#[rustc_clean(label="HirBody", cfg="cfail3")]
197215
#[rustc_metadata_dirty(cfg="cfail2")]
198216
#[rustc_metadata_clean(cfg="cfail3")]
199217
pub fn change_ufcs_callee_indirectly() {

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

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ pub fn change_condition(x: bool) -> u32 {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_dirty(label="Hir", cfg="cfail2")]
39+
#[rustc_clean(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
pub fn change_condition(x: bool) -> u32 {
@@ -59,8 +61,10 @@ pub fn change_then_branch(x: bool) -> u32 {
5961
}
6062

6163
#[cfg(not(cfail1))]
62-
#[rustc_dirty(label="Hir", cfg="cfail2")]
64+
#[rustc_clean(label="Hir", cfg="cfail2")]
6365
#[rustc_clean(label="Hir", cfg="cfail3")]
66+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
67+
#[rustc_clean(label="HirBody", cfg="cfail3")]
6468
#[rustc_metadata_dirty(cfg="cfail2")]
6569
#[rustc_metadata_clean(cfg="cfail3")]
6670
pub fn change_then_branch(x: bool) -> u32 {
@@ -84,8 +88,10 @@ pub fn change_else_branch(x: bool) -> u32 {
8488
}
8589

8690
#[cfg(not(cfail1))]
87-
#[rustc_dirty(label="Hir", cfg="cfail2")]
91+
#[rustc_clean(label="Hir", cfg="cfail2")]
8892
#[rustc_clean(label="Hir", cfg="cfail3")]
93+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
94+
#[rustc_clean(label="HirBody", cfg="cfail3")]
8995
#[rustc_metadata_dirty(cfg="cfail2")]
9096
#[rustc_metadata_clean(cfg="cfail3")]
9197
pub fn change_else_branch(x: bool) -> u32 {
@@ -111,8 +117,10 @@ pub fn add_else_branch(x: bool) -> u32 {
111117
}
112118

113119
#[cfg(not(cfail1))]
114-
#[rustc_dirty(label="Hir", cfg="cfail2")]
120+
#[rustc_clean(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
pub fn add_else_branch(x: bool) -> u32 {
@@ -139,8 +147,10 @@ pub fn change_condition_if_let(x: Option<u32>) -> u32 {
139147
}
140148

141149
#[cfg(not(cfail1))]
142-
#[rustc_dirty(label="Hir", cfg="cfail2")]
150+
#[rustc_clean(label="Hir", cfg="cfail2")]
143151
#[rustc_clean(label="Hir", cfg="cfail3")]
152+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
153+
#[rustc_clean(label="HirBody", cfg="cfail3")]
144154
#[rustc_metadata_dirty(cfg="cfail2")]
145155
#[rustc_metadata_clean(cfg="cfail3")]
146156
pub fn change_condition_if_let(x: Option<u32>) -> u32 {
@@ -164,8 +174,10 @@ pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
164174
}
165175

166176
#[cfg(not(cfail1))]
167-
#[rustc_dirty(label="Hir", cfg="cfail2")]
177+
#[rustc_clean(label="Hir", cfg="cfail2")]
168178
#[rustc_clean(label="Hir", cfg="cfail3")]
179+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
180+
#[rustc_clean(label="HirBody", cfg="cfail3")]
169181
#[rustc_metadata_dirty(cfg="cfail2")]
170182
#[rustc_metadata_clean(cfg="cfail3")]
171183
pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
@@ -189,8 +201,10 @@ pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
189201
}
190202

191203
#[cfg(not(cfail1))]
192-
#[rustc_dirty(label="Hir", cfg="cfail2")]
204+
#[rustc_clean(label="Hir", cfg="cfail2")]
193205
#[rustc_clean(label="Hir", cfg="cfail3")]
206+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
207+
#[rustc_clean(label="HirBody", cfg="cfail3")]
194208
#[rustc_metadata_dirty(cfg="cfail2")]
195209
#[rustc_metadata_clean(cfg="cfail3")]
196210
pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
@@ -216,8 +230,10 @@ pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
216230
}
217231

218232
#[cfg(not(cfail1))]
219-
#[rustc_dirty(label="Hir", cfg="cfail2")]
233+
#[rustc_clean(label="Hir", cfg="cfail2")]
220234
#[rustc_clean(label="Hir", cfg="cfail3")]
235+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
236+
#[rustc_clean(label="HirBody", cfg="cfail3")]
221237
#[rustc_metadata_dirty(cfg="cfail2")]
222238
#[rustc_metadata_clean(cfg="cfail3")]
223239
pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {

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

Lines changed: 36 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,10 @@ pub fn change_name() {
3232
}
3333

3434
#[cfg(not(cfail1))]
35-
#[rustc_dirty(label="Hir", cfg="cfail2")]
35+
#[rustc_clean(label="Hir", cfg="cfail2")]
3636
#[rustc_clean(label="Hir", cfg="cfail3")]
37+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
38+
#[rustc_clean(label="HirBody", cfg="cfail3")]
3739
#[rustc_metadata_dirty(cfg="cfail2")]
3840
#[rustc_metadata_clean(cfg="cfail3")]
3941
pub fn change_name() {
@@ -49,8 +51,10 @@ pub fn add_type() {
4951
}
5052

5153
#[cfg(not(cfail1))]
52-
#[rustc_dirty(label="Hir", cfg="cfail2")]
54+
#[rustc_clean(label="Hir", cfg="cfail2")]
5355
#[rustc_clean(label="Hir", cfg="cfail3")]
56+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
57+
#[rustc_clean(label="HirBody", cfg="cfail3")]
5458
#[rustc_metadata_dirty(cfg="cfail2")]
5559
#[rustc_metadata_clean(cfg="cfail3")]
5660
pub fn add_type() {
@@ -66,8 +70,10 @@ pub fn change_type() {
6670
}
6771

6872
#[cfg(not(cfail1))]
69-
#[rustc_dirty(label="Hir", cfg="cfail2")]
73+
#[rustc_clean(label="Hir", cfg="cfail2")]
7074
#[rustc_clean(label="Hir", cfg="cfail3")]
75+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
76+
#[rustc_clean(label="HirBody", cfg="cfail3")]
7177
#[rustc_metadata_dirty(cfg="cfail2")]
7278
#[rustc_metadata_clean(cfg="cfail3")]
7379
pub fn change_type() {
@@ -83,8 +89,10 @@ pub fn change_mutability_of_reference_type() {
8389
}
8490

8591
#[cfg(not(cfail1))]
86-
#[rustc_dirty(label="Hir", cfg="cfail2")]
92+
#[rustc_clean(label="Hir", cfg="cfail2")]
8793
#[rustc_clean(label="Hir", cfg="cfail3")]
94+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
95+
#[rustc_clean(label="HirBody", cfg="cfail3")]
8896
#[rustc_metadata_dirty(cfg="cfail2")]
8997
#[rustc_metadata_clean(cfg="cfail3")]
9098
pub fn change_mutability_of_reference_type() {
@@ -100,8 +108,10 @@ pub fn change_mutability_of_slot() {
100108
}
101109

102110
#[cfg(not(cfail1))]
103-
#[rustc_dirty(label="Hir", cfg="cfail2")]
111+
#[rustc_clean(label="Hir", cfg="cfail2")]
104112
#[rustc_clean(label="Hir", cfg="cfail3")]
113+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
114+
#[rustc_clean(label="HirBody", cfg="cfail3")]
105115
#[rustc_metadata_dirty(cfg="cfail2")]
106116
#[rustc_metadata_clean(cfg="cfail3")]
107117
pub fn change_mutability_of_slot() {
@@ -117,8 +127,10 @@ pub fn change_simple_binding_to_pattern() {
117127
}
118128

119129
#[cfg(not(cfail1))]
120-
#[rustc_dirty(label="Hir", cfg="cfail2")]
130+
#[rustc_clean(label="Hir", cfg="cfail2")]
121131
#[rustc_clean(label="Hir", cfg="cfail3")]
132+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
133+
#[rustc_clean(label="HirBody", cfg="cfail3")]
122134
#[rustc_metadata_dirty(cfg="cfail2")]
123135
#[rustc_metadata_clean(cfg="cfail3")]
124136
pub fn change_simple_binding_to_pattern() {
@@ -134,8 +146,10 @@ pub fn change_name_in_pattern() {
134146
}
135147

136148
#[cfg(not(cfail1))]
137-
#[rustc_dirty(label="Hir", cfg="cfail2")]
149+
#[rustc_clean(label="Hir", cfg="cfail2")]
138150
#[rustc_clean(label="Hir", cfg="cfail3")]
151+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
152+
#[rustc_clean(label="HirBody", cfg="cfail3")]
139153
#[rustc_metadata_dirty(cfg="cfail2")]
140154
#[rustc_metadata_clean(cfg="cfail3")]
141155
pub fn change_name_in_pattern() {
@@ -151,8 +165,10 @@ pub fn add_ref_in_pattern() {
151165
}
152166

153167
#[cfg(not(cfail1))]
154-
#[rustc_dirty(label="Hir", cfg="cfail2")]
168+
#[rustc_clean(label="Hir", cfg="cfail2")]
155169
#[rustc_clean(label="Hir", cfg="cfail3")]
170+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
171+
#[rustc_clean(label="HirBody", cfg="cfail3")]
156172
#[rustc_metadata_dirty(cfg="cfail2")]
157173
#[rustc_metadata_clean(cfg="cfail3")]
158174
pub fn add_ref_in_pattern() {
@@ -168,8 +184,10 @@ pub fn add_amp_in_pattern() {
168184
}
169185

170186
#[cfg(not(cfail1))]
171-
#[rustc_dirty(label="Hir", cfg="cfail2")]
187+
#[rustc_clean(label="Hir", cfg="cfail2")]
172188
#[rustc_clean(label="Hir", cfg="cfail3")]
189+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
190+
#[rustc_clean(label="HirBody", cfg="cfail3")]
173191
#[rustc_metadata_dirty(cfg="cfail2")]
174192
#[rustc_metadata_clean(cfg="cfail3")]
175193
pub fn add_amp_in_pattern() {
@@ -185,8 +203,10 @@ pub fn change_mutability_of_binding_in_pattern() {
185203
}
186204

187205
#[cfg(not(cfail1))]
188-
#[rustc_dirty(label="Hir", cfg="cfail2")]
206+
#[rustc_clean(label="Hir", cfg="cfail2")]
189207
#[rustc_clean(label="Hir", cfg="cfail3")]
208+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
209+
#[rustc_clean(label="HirBody", cfg="cfail3")]
190210
#[rustc_metadata_dirty(cfg="cfail2")]
191211
#[rustc_metadata_clean(cfg="cfail3")]
192212
pub fn change_mutability_of_binding_in_pattern() {
@@ -202,8 +222,10 @@ pub fn add_initializer() {
202222
}
203223

204224
#[cfg(not(cfail1))]
205-
#[rustc_dirty(label="Hir", cfg="cfail2")]
225+
#[rustc_clean(label="Hir", cfg="cfail2")]
206226
#[rustc_clean(label="Hir", cfg="cfail3")]
227+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
228+
#[rustc_clean(label="HirBody", cfg="cfail3")]
207229
#[rustc_metadata_dirty(cfg="cfail2")]
208230
#[rustc_metadata_clean(cfg="cfail3")]
209231
pub fn add_initializer() {
@@ -219,8 +241,10 @@ pub fn change_initializer() {
219241
}
220242

221243
#[cfg(not(cfail1))]
222-
#[rustc_dirty(label="Hir", cfg="cfail2")]
244+
#[rustc_clean(label="Hir", cfg="cfail2")]
223245
#[rustc_clean(label="Hir", cfg="cfail3")]
246+
#[rustc_dirty(label="HirBody", cfg="cfail2")]
247+
#[rustc_clean(label="HirBody", cfg="cfail3")]
224248
#[rustc_metadata_dirty(cfg="cfail2")]
225249
#[rustc_metadata_clean(cfg="cfail3")]
226250
pub fn change_initializer() {

0 commit comments

Comments
 (0)