mathieu/granite-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Refactor away a use of ast_map.span_if_local()

Browse source
This commit is contained in:
Jeffrey Seyfried 2016-04-27 01:18:04 +00:00
parent 3bcf818a8f
commit 33bb26998c
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/librustc_resolve/lib.rs
View file

@ -1819,11 +1819,21 @@ impl<'a, 'tcx> Resolver<'a, 'tcx> {
path_depth)));
// If it's a typedef, give a note
if let Def::TyAlias(did) = path_res.base_def {
if let Def::TyAlias(..) = path_res.base_def {
err.fileline_note(trait_path.span,
"`type` aliases cannot be used for traits");
if let Some(sp) = self.ast_map.span_if_local(did) {
err.span_note(sp, "type defined here");
let definition_site = {
let segments = &trait_path.segments;
if trait_path.global {
self.resolve_crate_relative_path(trait_path.span, segments, TypeNS)
} else {
self.resolve_module_relative_path(trait_path.span, segments, TypeNS)
}.map(|binding| binding.span).unwrap_or(codemap::DUMMY_SP)
};
if definition_site != codemap::DUMMY_SP {
err.span_note(definition_site, "type defined here");
}
}
err.emit();