diff options
| author | Esteban Küber <esteban@kuber.com.ar> | 2020-05-04 11:02:20 -0700 |
|---|---|---|
| committer | Esteban Küber <esteban@kuber.com.ar> | 2020-05-04 11:02:20 -0700 |
| commit | b13f234a1bb99b0cde82fb5c4a9de2eaf7b5dc87 (patch) | |
| tree | fc052b4998c54ec7af236e18335adf8caa425b38 | |
| parent | 5d64e914585e10b82ac4997b1d2c16585b8a77e8 (diff) | |
| download | rust-b13f234a1bb99b0cde82fb5c4a9de2eaf7b5dc87.tar.gz rust-b13f234a1bb99b0cde82fb5c4a9de2eaf7b5dc87.zip | |
fix rebase
| -rw-r--r-- | src/librustc_middle/ty/error.rs | 7 | ||||
| -rw-r--r-- | src/librustc_typeck/check/op.rs | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/src/librustc_middle/ty/error.rs b/src/librustc_middle/ty/error.rs index 329fd928c87..f3b6a53dfeb 100644 --- a/src/librustc_middle/ty/error.rs +++ b/src/librustc_middle/ty/error.rs @@ -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()) diff --git a/src/librustc_typeck/check/op.rs b/src/librustc_typeck/check/op.rs index 04267ccba66..688145fd0de 100644 --- a/src/librustc_typeck/check/op.rs +++ b/src/librustc_typeck/check/op.rs @@ -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()) |