OpenE2K/rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Refactor signaling of E0223 to avoid multiple span_errs for same code.

Browse Source
This commit is contained in:
Felix S. Klock II 2015-02-26 19:15:57 +01:00 committed by Manish Goregaokar
parent 2651823614
commit 9549350b87
1 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/librustc_typeck/astconv.rs
View File

@ -991,6 +991,17 @@ fn trait_ref_to_object_type<'tcx>(this: &AstConv<'tcx>,
result result
} }
fn report_ambiguous_associated_type(tcx: &ty::ctxt,
span: Span,
type_str: &str,
trait_str: &str,
name: &str) {
span_err!(tcx.sess, span, E0223,
"ambiguous associated type; specify the type using the syntax \
`<{} as {}>::{}`",
type_str, trait_str, name);
}
fn associated_path_def_to_ty<'tcx>(this: &AstConv<'tcx>, fn associated_path_def_to_ty<'tcx>(this: &AstConv<'tcx>,
span: Span, span: Span,
ty: Ty<'tcx>, ty: Ty<'tcx>,
@ -1011,10 +1022,8 @@ fn associated_path_def_to_ty<'tcx>(this: &AstConv<'tcx>,
let ty_param_node_id = if is_param { let ty_param_node_id = if is_param {
ty_path_def.local_node_id() ty_path_def.local_node_id()
} else { } else {
span_err!(tcx.sess, span, E0223, report_ambiguous_associated_type(
"ambiguous associated type; specify the type using the syntax \ tcx, span, &ty.user_string(tcx), "Trait", &token::get_name(assoc_name));
`<{} as Trait>::{}`",
ty.user_string(tcx), token::get_name(assoc_name));
return (tcx.types.err, ty_path_def); return (tcx.types.err, ty_path_def);
}; };
@ -1109,10 +1118,8 @@ fn qpath_to_ty<'tcx>(this: &AstConv<'tcx>,
ty ty
} else { } else {
let path_str = ty::item_path_str(tcx, trait_def_id); let path_str = ty::item_path_str(tcx, trait_def_id);
span_err!(tcx.sess, span, E0223, report_ambiguous_associated_type(
"ambiguous associated type; specify the type using the syntax \ tcx, span, "Type", &path_str, &token::get_ident(item_segment.identifier));
`<Type as {}>::{}`",
path_str, &token::get_ident(item_segment.identifier));
return tcx.types.err; return tcx.types.err;
}; };