Skip to content

Commit e35c56f

Browse files
committed
1 parent 1aff824 commit e35c56f

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# NOTE: Keep in sync with nightly date on README
22
[toolchain]
3-
channel = "nightly-2022-01-10"
3+
channel = "nightly-2022-01-13"
44
components = ["llvm-tools-preview", "rustc-dev"]

src/traverse.rs

+16-4
Original file line numberDiff line numberDiff line change
@@ -429,22 +429,34 @@ fn diff_adts(changes: &mut ChangeSet, id_mapping: &mut IdMapping, tcx: TyCtxt, o
429429
let mut fields = BTreeMap::new();
430430

431431
for variant in &old_def.variants {
432-
variants.entry(variant.ident.name).or_insert((None, None)).0 = Some(variant);
432+
variants
433+
.entry(variant.ident(tcx).name)
434+
.or_insert((None, None))
435+
.0 = Some(variant);
433436
}
434437

435438
for variant in &new_def.variants {
436-
variants.entry(variant.ident.name).or_insert((None, None)).1 = Some(variant);
439+
variants
440+
.entry(variant.ident(tcx).name)
441+
.or_insert((None, None))
442+
.1 = Some(variant);
437443
}
438444

439445
for items in variants.values() {
440446
match *items {
441447
(Some(old), Some(new)) => {
442448
for field in &old.fields {
443-
fields.entry(field.ident.name).or_insert((None, None)).0 = Some(field);
449+
fields
450+
.entry(field.ident(tcx).name)
451+
.or_insert((None, None))
452+
.0 = Some(field);
444453
}
445454

446455
for field in &new.fields {
447-
fields.entry(field.ident.name).or_insert((None, None)).1 = Some(field);
456+
fields
457+
.entry(field.ident(tcx).name)
458+
.or_insert((None, None))
459+
.1 = Some(field);
448460
}
449461

450462
let mut total_private = true;

0 commit comments

Comments
 (0)