Skip to content

Commit 274fb66

Browse files
ZoxcZoxc
committed
Replace Hir with hir_owner in tests
1 parent c0b60c4 commit 274fb66

23 files changed

+472
-472
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,8 @@ mod change_callee_indirectly_function {
5555
#[cfg(not(cfail1))]
5656
use super::callee2 as callee;
5757

58-
#[rustc_clean(label="Hir", cfg="cfail2")]
59-
#[rustc_clean(label="Hir", cfg="cfail3")]
58+
#[rustc_clean(label="hir_owner", cfg="cfail2")]
59+
#[rustc_clean(label="hir_owner", cfg="cfail3")]
6060
#[rustc_dirty(label="hir_owner_items", cfg="cfail2")]
6161
#[rustc_clean(label="hir_owner_items", cfg="cfail3")]
6262

@@ -152,7 +152,7 @@ pub fn change_to_ufcs() {
152152
#[rustc_clean(cfg="cfail2", except="hir_owner_items,mir_built,optimized_mir,typeck_tables_of")]
153153
#[rustc_clean(cfg="cfail3")]
154154
// One might think this would be expanded in the hir_owner_items/Mir, but it actually
155-
// results in slightly different Hir/Mir.
155+
// results in slightly different hir_owner/Mir.
156156
pub fn change_to_ufcs() {
157157
let s = Struct;
158158
Struct::method1(&s, 'x', true);

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
const CONST_VISIBILITY: u8 = 0;
2020

2121
#[cfg(not(cfail1))]
22-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
22+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
2323
#[rustc_clean(cfg="cfail3")]
2424
pub const CONST_VISIBILITY: u8 = 0;
2525

@@ -29,7 +29,7 @@ pub const CONST_VISIBILITY: u8 = 0;
2929
const CONST_CHANGE_TYPE_1: i32 = 0;
3030

3131
#[cfg(not(cfail1))]
32-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
32+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
3333
#[rustc_clean(cfg="cfail3")]
3434
const CONST_CHANGE_TYPE_1: u32 = 0;
3535

@@ -39,7 +39,7 @@ const CONST_CHANGE_TYPE_1: u32 = 0;
3939
const CONST_CHANGE_TYPE_2: Option<u32> = None;
4040

4141
#[cfg(not(cfail1))]
42-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
42+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
4343
#[rustc_clean(cfg="cfail3")]
4444
const CONST_CHANGE_TYPE_2: Option<u64> = None;
4545

@@ -99,11 +99,11 @@ mod const_change_type_indirectly {
9999
#[cfg(not(cfail1))]
100100
use super::ReferencedType2 as Type;
101101

102-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
102+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
103103
#[rustc_clean(cfg="cfail3")]
104104
const CONST_CHANGE_TYPE_INDIRECTLY_1: Type = Type;
105105

106-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
106+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
107107
#[rustc_clean(cfg="cfail3")]
108108
const CONST_CHANGE_TYPE_INDIRECTLY_2: Option<Type> = None;
109109
}

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ pub mod change_constructor_path_indirectly_struct_like {
139139

140140
#[rustc_clean(
141141
cfg="cfail2",
142-
except="fn_sig,Hir,hir_owner_items,optimized_mir,mir_built,\
142+
except="fn_sig,hir_owner,hir_owner_items,optimized_mir,mir_built,\
143143
typeck_tables_of"
144144
)]
145145
#[rustc_clean(cfg="cfail3")]
@@ -232,7 +232,7 @@ pub mod change_constructor_path_indirectly_tuple_like {
232232

233233
#[rustc_clean(
234234
cfg="cfail2",
235-
except="fn_sig,Hir,hir_owner_items,optimized_mir,mir_built,\
235+
except="fn_sig,hir_owner,hir_owner_items,optimized_mir,mir_built,\
236236
typeck_tables_of"
237237
)]
238238
#[rustc_clean(cfg="cfail3")]
@@ -309,7 +309,7 @@ pub mod change_constructor_path_indirectly_c_like {
309309

310310
#[rustc_clean(
311311
cfg="cfail2",
312-
except="fn_sig,Hir,hir_owner_items,optimized_mir,mir_built,\
312+
except="fn_sig,hir_owner,hir_owner_items,optimized_mir,mir_built,\
313313
typeck_tables_of"
314314
)]
315315
#[rustc_clean(cfg="cfail3")]

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

+26-26
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
enum EnumVisibility { A }
2727

2828
#[cfg(not(cfail1))]
29-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
29+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
3030
#[rustc_clean(cfg="cfail3")]
3131
pub enum EnumVisibility {
3232
A
@@ -42,7 +42,7 @@ enum EnumChangeNameCStyleVariant {
4242
}
4343

4444
#[cfg(not(cfail1))]
45-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
45+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
4646
#[rustc_clean(cfg="cfail3")]
4747
enum EnumChangeNameCStyleVariant {
4848
Variant1,
@@ -59,7 +59,7 @@ enum EnumChangeNameTupleStyleVariant {
5959
}
6060

6161
#[cfg(not(cfail1))]
62-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
62+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
6363
#[rustc_clean(cfg="cfail3")]
6464
enum EnumChangeNameTupleStyleVariant {
6565
Variant1,
@@ -76,7 +76,7 @@ enum EnumChangeNameStructStyleVariant {
7676
}
7777

7878
#[cfg(not(cfail1))]
79-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
79+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
8080
#[rustc_clean(cfg="cfail3")]
8181
enum EnumChangeNameStructStyleVariant {
8282
Variant1,
@@ -109,7 +109,7 @@ enum EnumChangeValueCStyleVariant1 {
109109
}
110110

111111
#[cfg(not(cfail1))]
112-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
112+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
113113
#[rustc_clean(cfg="cfail3")]
114114
enum EnumChangeValueCStyleVariant1 {
115115
Variant1,
@@ -125,7 +125,7 @@ enum EnumAddCStyleVariant {
125125
}
126126

127127
#[cfg(not(cfail1))]
128-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
128+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
129129
#[rustc_clean(cfg="cfail3")]
130130
enum EnumAddCStyleVariant {
131131
Variant1,
@@ -142,7 +142,7 @@ enum EnumRemoveCStyleVariant {
142142
}
143143

144144
#[cfg(not(cfail1))]
145-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
145+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
146146
#[rustc_clean(cfg="cfail3")]
147147
enum EnumRemoveCStyleVariant {
148148
Variant1,
@@ -157,7 +157,7 @@ enum EnumAddTupleStyleVariant {
157157
}
158158

159159
#[cfg(not(cfail1))]
160-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
160+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
161161
#[rustc_clean(cfg="cfail3")]
162162
enum EnumAddTupleStyleVariant {
163163
Variant1,
@@ -174,7 +174,7 @@ enum EnumRemoveTupleStyleVariant {
174174
}
175175

176176
#[cfg(not(cfail1))]
177-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
177+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
178178
#[rustc_clean(cfg="cfail3")]
179179
enum EnumRemoveTupleStyleVariant {
180180
Variant1,
@@ -189,7 +189,7 @@ enum EnumAddStructStyleVariant {
189189
}
190190

191191
#[cfg(not(cfail1))]
192-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
192+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
193193
#[rustc_clean(cfg="cfail3")]
194194
enum EnumAddStructStyleVariant {
195195
Variant1,
@@ -206,7 +206,7 @@ enum EnumRemoveStructStyleVariant {
206206
}
207207

208208
#[cfg(not(cfail1))]
209-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
209+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
210210
#[rustc_clean(cfg="cfail3")]
211211
enum EnumRemoveStructStyleVariant {
212212
Variant1,
@@ -221,7 +221,7 @@ enum EnumChangeFieldTypeTupleStyleVariant {
221221
}
222222

223223
#[cfg(not(cfail1))]
224-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
224+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
225225
#[rustc_clean(cfg="cfail3")]
226226
enum EnumChangeFieldTypeTupleStyleVariant {
227227
Variant1(u32,
@@ -238,7 +238,7 @@ enum EnumChangeFieldTypeStructStyleVariant {
238238
}
239239

240240
#[cfg(not(cfail1))]
241-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
241+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
242242
#[rustc_clean(cfg="cfail3")]
243243
enum EnumChangeFieldTypeStructStyleVariant {
244244
Variant1,
@@ -257,7 +257,7 @@ enum EnumChangeFieldNameStructStyleVariant {
257257
}
258258

259259
#[cfg(not(cfail1))]
260-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
260+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
261261
#[rustc_clean(cfg="cfail3")]
262262
enum EnumChangeFieldNameStructStyleVariant {
263263
Variant1 { a: u32, c: u32 },
@@ -272,7 +272,7 @@ enum EnumChangeOrderTupleStyleVariant {
272272
}
273273

274274
#[cfg(not(cfail1))]
275-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
275+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
276276
#[rustc_clean(cfg="cfail3")]
277277
enum EnumChangeOrderTupleStyleVariant {
278278
Variant1(
@@ -289,7 +289,7 @@ enum EnumChangeFieldOrderStructStyleVariant {
289289
}
290290

291291
#[cfg(not(cfail1))]
292-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
292+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
293293
#[rustc_clean(cfg="cfail3")]
294294
enum EnumChangeFieldOrderStructStyleVariant {
295295
Variant1 { b: f32, a: u32 },
@@ -304,7 +304,7 @@ enum EnumAddFieldTupleStyleVariant {
304304
}
305305

306306
#[cfg(not(cfail1))]
307-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
307+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
308308
#[rustc_clean(cfg="cfail3")]
309309
enum EnumAddFieldTupleStyleVariant {
310310
Variant1(u32, u32, u32),
@@ -319,7 +319,7 @@ enum EnumAddFieldStructStyleVariant {
319319
}
320320

321321
#[cfg(not(cfail1))]
322-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
322+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
323323
#[rustc_clean(cfg="cfail3")]
324324
enum EnumAddFieldStructStyleVariant {
325325
Variant1 { a: u32, b: u32, c: u32 },
@@ -335,7 +335,7 @@ enum EnumAddMustUse {
335335
}
336336

337337
#[cfg(not(cfail1))]
338-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
338+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
339339
#[rustc_clean(cfg="cfail3")]
340340
#[must_use]
341341
enum EnumAddMustUse {
@@ -353,7 +353,7 @@ enum EnumAddReprC {
353353
}
354354

355355
#[cfg(not(cfail1))]
356-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,type_of")]
356+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,type_of")]
357357
#[rustc_clean(cfg="cfail3")]
358358
#[repr(C)]
359359
enum EnumAddReprC {
@@ -531,7 +531,7 @@ enum EnumSwapUsageTypeParameters<A, B> {
531531
}
532532

533533
#[cfg(not(cfail1))]
534-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
534+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
535535
#[rustc_clean(cfg="cfail3")]
536536
enum EnumSwapUsageTypeParameters<A, B> {
537537
Variant1 {
@@ -552,7 +552,7 @@ enum EnumSwapUsageLifetimeParameters<'a, 'b> {
552552
}
553553

554554
#[cfg(not(cfail1))]
555-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
555+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
556556
#[rustc_clean(cfg="cfail3")]
557557
enum EnumSwapUsageLifetimeParameters<'a, 'b> {
558558
Variant1 {
@@ -577,7 +577,7 @@ mod change_field_type_indirectly_tuple_style {
577577
#[cfg(not(cfail1))]
578578
use super::ReferencedType2 as FieldType;
579579

580-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
580+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
581581
#[rustc_clean(cfg="cfail3")]
582582
enum TupleStyle {
583583
Variant1(
@@ -595,7 +595,7 @@ mod change_field_type_indirectly_struct_style {
595595
#[cfg(not(cfail1))]
596596
use super::ReferencedType2 as FieldType;
597597

598-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items")]
598+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items")]
599599
#[rustc_clean(cfg="cfail3")]
600600
enum StructStyle {
601601
Variant1 {
@@ -618,7 +618,7 @@ mod change_trait_bound_indirectly {
618618
#[cfg(not(cfail1))]
619619
use super::ReferencedTrait2 as Trait;
620620

621-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,predicates_of")]
621+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,predicates_of")]
622622
#[rustc_clean(cfg="cfail3")]
623623
enum Enum<T: Trait> {
624624
Variant1(T)
@@ -634,7 +634,7 @@ mod change_trait_bound_indirectly_where {
634634
#[cfg(not(cfail1))]
635635
use super::ReferencedTrait2 as Trait;
636636

637-
#[rustc_clean(cfg="cfail2", except="Hir,hir_owner_items,predicates_of")]
637+
#[rustc_clean(cfg="cfail2", except="hir_owner,hir_owner_items,predicates_of")]
638638
#[rustc_clean(cfg="cfail3")]
639639
enum Enum<T> where T: Trait {
640640
Variant1(T)

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
// Case 1: The function body is not exported to metadata. If the body changes,
1010
// the hash of the hir_owner_items node should change, but not the hash of
11-
// either the Hir or the Metadata node.
11+
// either the hir_owner or the Metadata node.
1212

1313
#[cfg(cfail1)]
1414
pub fn body_not_exported_to_metadata() -> u32 {
@@ -25,7 +25,7 @@ pub fn body_not_exported_to_metadata() -> u32 {
2525

2626

2727
// Case 2: The function body *is* exported to metadata because the function is
28-
// marked as #[inline]. Only the hash of the Hir depnode should be
28+
// marked as #[inline]. Only the hash of the hir_owner depnode should be
2929
// unaffected by a change to the body.
3030

3131
#[cfg(cfail1)]
@@ -45,7 +45,7 @@ pub fn body_exported_to_metadata_because_of_inline() -> u32 {
4545

4646

4747
// Case 2: The function body *is* exported to metadata because the function is
48-
// generic. Only the hash of the Hir depnode should be
48+
// generic. Only the hash of the hir_owner depnode should be
4949
// unaffected by a change to the body.
5050

5151
#[cfg(cfail1)]

0 commit comments

Comments
 (0)