bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

InferCtxt::is_tainted_by_errors returns ErrorGuaranteed

Browse source
This commit is contained in:
Boxy 2022-11-17 20:57:45 +00:00
parent c1ec8ff14d
commit 9c510048fd
10 changed files with 33 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/rustc_borrowck/src/lib.rs
View file

@ -19,7 +19,7 @@ extern crate tracing;
use rustc_data_structures::fx::{FxHashMap, FxHashSet};
use rustc_data_structures::graph::dominators::Dominators;
use rustc_data_structures::vec_map::VecMap;
use rustc_errors::{Diagnostic, DiagnosticBuilder, ErrorGuaranteed};
use rustc_errors::{Diagnostic, DiagnosticBuilder};
use rustc_hir as hir;
use rustc_hir::def_id::LocalDefId;
use rustc_index::bit_set::ChunkedBitSet;

4
compiler/rustc_borrowck/src/region_infer/opaque_types.rs
View file

@ -219,8 +219,8 @@ impl<'tcx> InferCtxtExt<'tcx> for InferCtxt<'tcx> {
instantiated_ty: OpaqueHiddenType<'tcx>,
origin: OpaqueTyOrigin,
) -> Ty<'tcx> {
if self.is_tainted_by_errors() {
return self.tcx.ty_error();
if let Some(e) = self.is_tainted_by_errors() {
return self.tcx.ty_error_with_guaranteed(e);
}
let definition_ty = instantiated_ty