bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

refactor report_generic_bound_failure to be usable by NLL code

Browse source
This commit is contained in:
Niko Matsakis 2017-12-19 11:10:53 -05:00
parent 6b39781df6
commit 3788f4207d
1 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

35
src/librustc/infer/error_reporting/mod.rs
View file

@ -304,8 +304,14 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
self.report_concrete_failure(region_scope_tree, origin, sub, sup).emit(); self.report_concrete_failure(region_scope_tree, origin, sub, sup).emit();
} }
RegionResolutionError::GenericBoundFailure(kind, param_ty, sub) => { RegionResolutionError::GenericBoundFailure(origin, param_ty, sub) => {
self.report_generic_bound_failure(region_scope_tree, kind, param_ty, sub); self.report_generic_bound_failure(
region_scope_tree,
origin.span(),
Some(origin),
param_ty,
sub,
);
} }
RegionResolutionError::SubSupConflict(var_origin, RegionResolutionError::SubSupConflict(var_origin,
@ -901,11 +907,12 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
DiagnosticStyledString::highlighted(format!("{}", exp_found.found)))) DiagnosticStyledString::highlighted(format!("{}", exp_found.found))))
} }
fn report_generic_bound_failure(&self, pub fn report_generic_bound_failure(&self,
region_scope_tree: &region::ScopeTree, region_scope_tree: &region::ScopeTree,
origin: SubregionOrigin<'tcx>, span: Span,
bound_kind: GenericKind<'tcx>, origin: Option<SubregionOrigin<'tcx>>,
sub: Region<'tcx>) bound_kind: GenericKind<'tcx>,
sub: Region<'tcx>)
{ {
// Attempt to obtain the span of the parameter so we can // Attempt to obtain the span of the parameter so we can
// suggest adding an explicit lifetime bound to it. // suggest adding an explicit lifetime bound to it.
@ -953,9 +960,9 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
format!("the associated type `{}`", p), format!("the associated type `{}`", p),
}; };
if let SubregionOrigin::CompareImplMethodObligation { if let Some(SubregionOrigin::CompareImplMethodObligation {
span, item_name, impl_item_def_id, trait_item_def_id, span, item_name, impl_item_def_id, trait_item_def_id,
} = origin { }) = origin {
self.report_extra_impl_obligation(span, self.report_extra_impl_obligation(span,
item_name, item_name,
impl_item_def_id, impl_item_def_id,
@ -990,7 +997,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
ty::ReFree(ty::FreeRegion {bound_region: ty::BrNamed(..), ..}) => { ty::ReFree(ty::FreeRegion {bound_region: ty::BrNamed(..), ..}) => {
// Does the required lifetime have a nice name we can print? // Does the required lifetime have a nice name we can print?
let mut err = struct_span_err!(self.tcx.sess, let mut err = struct_span_err!(self.tcx.sess,
origin.span(), span,
E0309, E0309,
"{} may not live long enough", "{} may not live long enough",
labeled_user_string); labeled_user_string);
@ -1001,7 +1008,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
ty::ReStatic => { ty::ReStatic => {
// Does the required lifetime have a nice name we can print? // Does the required lifetime have a nice name we can print?
let mut err = struct_span_err!(self.tcx.sess, let mut err = struct_span_err!(self.tcx.sess,
origin.span(), span,
E0310, E0310,
"{} may not live long enough", "{} may not live long enough",
labeled_user_string); labeled_user_string);
@ -1012,7 +1019,7 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
_ => { _ => {
// If not, be less specific. // If not, be less specific.
let mut err = struct_span_err!(self.tcx.sess, let mut err = struct_span_err!(self.tcx.sess,
origin.span(), span,
E0311, E0311,
"{} may not live long enough", "{} may not live long enough",
labeled_user_string); labeled_user_string);
@ -1028,7 +1035,9 @@ impl<'a, 'gcx, 'tcx> InferCtxt<'a, 'gcx, 'tcx> {
} }
}; };
self.note_region_origin(&mut err, &origin); if let Some(origin) = origin {
self.note_region_origin(&mut err, &origin);
}
err.emit(); err.emit();
} }