Skip to content

Commit b5eecb0

Browse files
committed
formatted, and resolved dyn trait reflection UI tests after rebase,
1 parent 9325038 commit b5eecb0

3 files changed

Lines changed: 9 additions & 9 deletions

File tree

compiler/rustc_const_eval/src/const_eval/type_info.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,13 @@ use rustc_middle::mir::interpret::{CtfeProvenance, Scalar};
55
use rustc_middle::span_bug;
66
use rustc_middle::ty::layout::TyAndLayout;
77
use rustc_middle::ty::{self, Const, Region, ScalarInt, Ty};
8+
use rustc_span::def_id::DefId;
89
use rustc_span::{Symbol, sym};
910

1011
use crate::const_eval::CompileTimeMachine;
1112
use crate::interpret::{
1213
Immediate, InterpCx, InterpResult, MPlaceTy, MemoryKind, Writeable, interp_ok,
1314
};
14-
use rustc_span::def_id::DefId;
1515

1616
impl<'tcx> InterpCx<'tcx, CompileTimeMachine<'tcx>> {
1717
/// Writes a `core::mem::type_info::TypeInfo` for a given type, `ty` to the given place.

tests/ui/reflection/dump.bit32.run.stdout

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Type {
224224
DynTrait {
225225
predicates: [
226226
Trait {
227-
ty: TypeId(0xa1465d8f7af89f68734d9847ef7d78db),
227+
ty: TypeId(0x1262c29eb0bc65b6104097703b8675b9),
228228
super_traits: [],
229229
is_auto: true,
230230
},
@@ -276,7 +276,7 @@ Type {
276276
is_auto: false,
277277
},
278278
Trait {
279-
ty: TypeId(0xa1465d8f7af89f68734d9847ef7d78db),
279+
ty: TypeId(0x1262c29eb0bc65b6104097703b8675b9),
280280
super_traits: [],
281281
is_auto: true,
282282
},
@@ -405,12 +405,12 @@ Type {
405405
is_auto: false,
406406
},
407407
Trait {
408-
ty: TypeId(0xa6ae2f670abe6d7f395b726a84d2e1a8),
408+
ty: TypeId(0xfdae03a92807c156cb75121d4fc9b4b6),
409409
super_traits: [],
410410
is_auto: true,
411411
},
412412
Trait {
413-
ty: TypeId(0xa1465d8f7af89f68734d9847ef7d78db),
413+
ty: TypeId(0x1262c29eb0bc65b6104097703b8675b9),
414414
super_traits: [],
415415
is_auto: true,
416416
},

tests/ui/reflection/dump.bit64.run.stdout

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ Type {
224224
DynTrait {
225225
predicates: [
226226
Trait {
227-
ty: TypeId(0x0d5e48167084e668b711d10061f0446a),
227+
ty: TypeId(0xa6c446dd24a5b892d56e108adf3170ea),
228228
super_traits: [],
229229
is_auto: true,
230230
},
@@ -276,7 +276,7 @@ Type {
276276
is_auto: false,
277277
},
278278
Trait {
279-
ty: TypeId(0x0d5e48167084e668b711d10061f0446a),
279+
ty: TypeId(0xa6c446dd24a5b892d56e108adf3170ea),
280280
super_traits: [],
281281
is_auto: true,
282282
},
@@ -405,12 +405,12 @@ Type {
405405
is_auto: false,
406406
},
407407
Trait {
408-
ty: TypeId(0x00a958019c194129ebdf1f63f91094f3),
408+
ty: TypeId(0xa6c446dd24a5b892d56e108adf3170ea),
409409
super_traits: [],
410410
is_auto: true,
411411
},
412412
Trait {
413-
ty: TypeId(0x0d5e48167084e668b711d10061f0446a),
413+
ty: TypeId(0x8940b6a52f4f788e776d5291500b8206),
414414
super_traits: [],
415415
is_auto: true,
416416
},

0 commit comments

Comments
 (0)