diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2021-12-07 11:05:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-07 11:05:00 +0100 |
| commit | dd929ae4c56bbffb465ad12e70c9f40adfffe57f (patch) | |
| tree | 848a4e0deb64211329adb3939c9b25165e080798 | |
| parent | 677f878e36e6b089c3213063508ec6b11c340a1f (diff) | |
| parent | 9e5939ad92ae1096e3945bbfdfe81ec515ed0c69 (diff) | |
| download | rust-dd929ae4c56bbffb465ad12e70c9f40adfffe57f.tar.gz rust-dd929ae4c56bbffb465ad12e70c9f40adfffe57f.zip | |
Rollup merge of #91493 - oli-obk:cleanup, r=michaelwoerister
Remove a dead code path. It is neither documented nor can I see any way it could ever be reached. Also, no tests fail when turning that arm into an ICE
| -rw-r--r-- | compiler/rustc_infer/src/infer/opaque_types.rs | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/compiler/rustc_infer/src/infer/opaque_types.rs b/compiler/rustc_infer/src/infer/opaque_types.rs index 89c14bcc2ce..d9ab4ae1eda 100644 --- a/compiler/rustc_infer/src/infer/opaque_types.rs +++ b/compiler/rustc_infer/src/infer/opaque_types.rs @@ -461,10 +461,6 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> { if let Some(def_id) = def_id.as_local() { let opaque_hir_id = tcx.hir().local_def_id_to_hir_id(def_id); let parent_def_id = self.infcx.defining_use_anchor; - let def_scope_default = || { - let opaque_parent_hir_id = tcx.hir().get_parent_item(opaque_hir_id); - parent_def_id == tcx.hir().local_def_id(opaque_parent_hir_id) - }; let (in_definition_scope, origin) = match tcx.hir().expect_item(def_id).kind { // Anonymous `impl Trait` @@ -481,7 +477,14 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> { }) => { (may_define_opaque_type(tcx, parent_def_id, opaque_hir_id), origin) } - _ => (def_scope_default(), hir::OpaqueTyOrigin::TyAlias), + ref itemkind => { + span_bug!( + self.value_span, + "weird opaque type: {:#?}, {:#?}", + ty.kind(), + itemkind + ) + } }; if in_definition_scope { let opaque_type_key = |
