mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rollup merge of #91493 - oli-obk:cleanup, r=michaelwoerister

Browse Source 
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
This commit is contained in:
Matthias Krüger 2021-12-07 11:05:00 +01:00 committed by GitHub
commit dd929ae4c5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
compiler/rustc_infer/src/infer/opaque_types.rs
View File

@ -461,10 +461,6 @@ impl<'a, 'tcx> Instantiator<'a, 'tcx> {
if let Some(def_id) = def_id.as_local() { if let Some(def_id) = def_id.as_local() {
let opaque_hir_id = tcx.hir().local_def_id_to_hir_id(def_id); let opaque_hir_id = tcx.hir().local_def_id_to_hir_id(def_id);
let parent_def_id = self.infcx.defining_use_anchor; 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 let (in_definition_scope, origin) = match tcx.hir().expect_item(def_id).kind
{ {
// Anonymous `impl Trait` // 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) (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 { if in_definition_scope {
let opaque_type_key = let opaque_type_key =