bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix NLL compare mode tests

Browse source
This commit is contained in:
Matthew Jasper 2020-10-06 08:39:49 +01:00
parent c9eeb60b63
commit 69fc6d8c5c
3 changed files with 47 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

9
compiler/rustc_mir/src/borrow_check/diagnostics/region_errors.rs
View file

@ -6,6 +6,7 @@ use rustc_infer::infer::{
error_reporting::unexpected_hidden_region_diagnostic, NLLRegionVariableOrigin,
};
use rustc_middle::mir::{ConstraintCategory, ReturnConstraint};
use rustc_middle::ty::subst::Subst;
use rustc_middle::ty::{self, RegionVid, Ty};
use rustc_span::symbol::{kw, sym};
use rustc_span::Span;
@ -585,14 +586,14 @@ impl<'a, 'tcx> MirBorrowckCtxt<'a, 'tcx> {
//
// eg. check for `impl Trait + 'static` instead of `impl Trait`.
let has_static_predicate = {
let predicates_of = self.infcx.tcx.predicates_of(did);
let bounds = predicates_of.instantiate(self.infcx.tcx, substs);
let bounds = self.infcx.tcx.explicit_item_bounds(did);
let mut found = false;
for predicate in bounds.predicates {
for (bound, _) in bounds {
if let ty::PredicateAtom::TypeOutlives(ty::OutlivesPredicate(_, r)) =
predicate.skip_binders()
bound.skip_binders()
{
let r = r.subst(self.infcx.tcx, substs);
if let ty::RegionKind::ReStatic = r {
found = true;
break;