diff options
| author | bors <bors@rust-lang.org> | 2022-09-24 22:42:07 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-09-24 22:42:07 +0000 |
| commit | d0ece44cfa3be0f2edfebe286d61f15b8affa0c6 (patch) | |
| tree | 425236296769dc2cdc17b16d0f7066122026335f /src/test | |
| parent | 3f83906b30798bf61513fa340524cebf6676f9db (diff) | |
| parent | 8fe936099a3a2ea236d40212a340fc4a326eb506 (diff) | |
| download | rust-d0ece44cfa3be0f2edfebe286d61f15b8affa0c6.tar.gz rust-d0ece44cfa3be0f2edfebe286d61f15b8affa0c6.zip | |
Auto merge of #102040 - TaKO8Ki:separate-definitions-and-hir-owners, r=cjgillot
Separate definitions and HIR owners in the type system Fixes #83158 r? `@cjgillot`
Diffstat (limited to 'src/test')
| -rw-r--r-- | src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs | 2 | ||||
| -rw-r--r-- | src/test/ui/thir-tree.stdout | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs index 03ad3ca8261..03da804bd1c 100644 --- a/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs +++ b/src/test/ui-fulldeps/auxiliary/issue-40001-plugin.rs @@ -44,7 +44,7 @@ impl<'tcx> LateLintPass<'tcx> for MissingAllowedAttrPass { ) { let item = match cx.tcx.hir().get(id) { Node::Item(item) => item, - _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id)), + _ => cx.tcx.hir().expect_item(cx.tcx.hir().get_parent_item(id).def_id), }; let allowed = |attr| pprust::attribute_to_string(attr).contains("allowed_attr"); diff --git a/src/test/ui/thir-tree.stdout b/src/test/ui/thir-tree.stdout index 5fcdfca18d6..7fb90581f8a 100644 --- a/src/test/ui/thir-tree.stdout +++ b/src/test/ui/thir-tree.stdout @@ -33,7 +33,9 @@ Thir { region_scope: Node(2), lint_level: Explicit( HirId { - owner: DefId(0:3 ~ thir_tree[8f1d]::main), + owner: OwnerId { + def_id: DefId(0:3 ~ thir_tree[8f1d]::main), + }, local_id: 2, }, ), |