pacify the mercilous tidy
long lines, trailing newlines
This commit is contained in:
parent
4831146afa
commit
a18c779fa2
4 changed files with 15 additions and 6 deletions
|
@ -307,7 +307,8 @@ impl<'tcx, V> Canonical<'tcx, V> {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub type QueryOutlivesConstraint<'tcx> = ty::Binder<ty::OutlivesPredicate<Kind<'tcx>, Region<'tcx>>>;
|
pub type QueryOutlivesConstraint<'tcx> =
|
||||||
|
ty::Binder<ty::OutlivesPredicate<Kind<'tcx>, Region<'tcx>>>;
|
||||||
|
|
||||||
impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
|
impl<'cx, 'tcx> InferCtxt<'cx, 'tcx> {
|
||||||
/// Creates a substitution S for the canonical value with fresh
|
/// Creates a substitution S for the canonical value with fresh
|
||||||
|
|
|
@ -973,6 +973,9 @@ impl<'tcx> RegionConstraintData<'tcx> {
|
||||||
verifys,
|
verifys,
|
||||||
givens,
|
givens,
|
||||||
} = self;
|
} = self;
|
||||||
constraints.is_empty() && pick_constraints.is_empty() && verifys.is_empty() && givens.is_empty()
|
constraints.is_empty() &&
|
||||||
|
pick_constraints.is_empty() &&
|
||||||
|
verifys.is_empty() &&
|
||||||
|
givens.is_empty()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -110,4 +110,3 @@ impl<N: Idx> WithSuccessors for VecGraph<N> {
|
||||||
self.successors(node).iter().cloned()
|
self.successors(node).iter().cloned()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1493,19 +1493,25 @@ impl<'tcx> RegionInferenceContext<'tcx> {
|
||||||
debug!("check_pick_constraint(p_c_i={:?})", p_c_i);
|
debug!("check_pick_constraint(p_c_i={:?})", p_c_i);
|
||||||
let p_c = &pick_constraints[p_c_i];
|
let p_c = &pick_constraints[p_c_i];
|
||||||
let pick_region_vid = p_c.pick_region_vid;
|
let pick_region_vid = p_c.pick_region_vid;
|
||||||
debug!("check_pick_constraint: pick_region_vid={:?} with value {}", pick_region_vid, self.region_value_str(pick_region_vid));
|
debug!(
|
||||||
|
"check_pick_constraint: pick_region_vid={:?} with value {}",
|
||||||
|
pick_region_vid,
|
||||||
|
self.region_value_str(pick_region_vid),
|
||||||
|
);
|
||||||
let option_regions = pick_constraints.option_regions(p_c_i);
|
let option_regions = pick_constraints.option_regions(p_c_i);
|
||||||
debug!("check_pick_constraint: option_regions={:?}", option_regions);
|
debug!("check_pick_constraint: option_regions={:?}", option_regions);
|
||||||
|
|
||||||
// did the pick-region wind up equal to any of the option regions?
|
// did the pick-region wind up equal to any of the option regions?
|
||||||
if let Some(o) = option_regions.iter().find(|&&o_r| self.eval_equal(o_r, p_c.pick_region_vid)) {
|
if let Some(o) = option_regions.iter().find(|&&o_r| {
|
||||||
|
self.eval_equal(o_r, p_c.pick_region_vid)
|
||||||
|
}) {
|
||||||
debug!("check_pick_constraint: evaluated as equal to {:?}", o);
|
debug!("check_pick_constraint: evaluated as equal to {:?}", o);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
// if not, report an error
|
// if not, report an error
|
||||||
let region_scope_tree = &infcx.tcx.region_scope_tree(mir_def_id);
|
let region_scope_tree = &infcx.tcx.region_scope_tree(mir_def_id);
|
||||||
let pick_region = infcx.tcx.mk_region(ty::ReVar(pick_region_vid)); // XXX
|
let pick_region = infcx.tcx.mk_region(ty::ReVar(pick_region_vid));
|
||||||
opaque_types::unexpected_hidden_region_diagnostic(
|
opaque_types::unexpected_hidden_region_diagnostic(
|
||||||
infcx.tcx,
|
infcx.tcx,
|
||||||
Some(region_scope_tree),
|
Some(region_scope_tree),
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue