bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

merge need_type_info_err(_const)

Browse source
This commit is contained in:
Bastian Kauschke 2020-09-23 09:24:58 +02:00
parent e0bc267512
commit 45d92b43e3
13 changed files with 148 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

6
compiler/rustc_mir/src/borrow_check/diagnostics/region_name.rs
View file

@ -396,7 +396,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
) -> Option<RegionNameHighlight> {
let mut highlight = RegionHighlightMode::default();
highlight.highlighting_region_vid(needle_fr, counter);
let type_name = self.infcx.extract_type_name(&ty, Some(highlight)).0;
let type_name = self.infcx.extract_type_name(ty.into(), Some(highlight)).0;
debug!(
"highlight_if_we_cannot_match_hir_ty: type_name={:?} needle_fr={:?}",
@ -646,7 +646,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
let mut highlight = RegionHighlightMode::default();
highlight.highlighting_region_vid(fr, *self.next_region_name.try_borrow().unwrap());
let type_name = self.infcx.extract_type_name(&return_ty, Some(highlight)).0;
let type_name = self.infcx.extract_type_name(return_ty.into(), Some(highlight)).0;
let mir_hir_id = tcx.hir().local_def_id_to_hir_id(self.mir_def_id);
@ -698,7 +698,7 @@ impl<'tcx> MirBorrowckCtxt<'_, 'tcx> {
let mut highlight = RegionHighlightMode::default();
highlight.highlighting_region_vid(fr, *self.next_region_name.try_borrow().unwrap());
let type_name = self.infcx.extract_type_name(&yield_ty, Some(highlight)).0;
let type_name = self.infcx.extract_type_name(yield_ty.into(), Some(highlight)).0;
let mir_hir_id = tcx.hir().local_def_id_to_hir_id(self.mir_def_id);