Skip to content

Commit d670419

Browse files
committed
1 parent e66f3cb commit d670419

File tree

2 files changed

+17
-5
lines changed

2 files changed

+17
-5
lines changed

rust-toolchain

Lines changed: 1 addition & 1 deletion
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

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

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

434437
for variant in &new_def.variants {
435-
variants.entry(variant.ident.name).or_insert((None, None)).1 = Some(variant);
438+
variants
439+
.entry(variant.ident(tcx).name)
440+
.or_insert((None, None))
441+
.1 = Some(variant);
436442
}
437443

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

445454
for field in &new.fields {
446-
fields.entry(field.ident.name).or_insert((None, None)).1 = Some(field);
455+
fields
456+
.entry(field.ident(tcx).name)
457+
.or_insert((None, None))
458+
.1 = Some(field);
447459
}
448460

449461
let mut total_private = true;

0 commit comments

Comments
 (0)