user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix rebase

Browse source
This commit is contained in:
Esteban Küber 2020-05-04 11:02:20 -07:00
parent 5d64e91458
commit b13f234a1b
2 changed files with 8 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/librustc_middle/ty/error.rs
View file

@ -410,8 +410,11 @@ impl<'tcx> TyCtxt<'tcx> {
}
let hir = self.hir();
let mut note = true;
if let Some(generics) = hir
.as_local_hir_id(generics.type_param(p, self).def_id)
if let Some(generics) = generics
.type_param(p, self)
.def_id
.as_local()
.map(|id| hir.as_local_hir_id(id))
.and_then(|id| self.hir().find(self.hir().get_parent_node(id)))
.as_ref()
.and_then(|node| node.generics())

5
src/librustc_typeck/check/op.rs
View file

@ -954,8 +954,9 @@ fn suggest_constraining_param(
let def_id = hir.body_owner_def_id(hir::BodyId { hir_id: body_id });
let generics = tcx.generics_of(def_id);
let param_def_id = generics.type_param(&p, tcx).def_id;
if let Some(generics) = hir
.as_local_hir_id(param_def_id)
if let Some(generics) = param_def_id
.as_local()
.map(|id| hir.as_local_hir_id(id))
.and_then(|id| hir.find(hir.get_parent_item(id)))
.as_ref()
.and_then(|node| node.generics())