user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

save-analysis: Use the correct span for extern crate

Browse source
This commit is contained in:
Nick Cameron 2015-01-19 14:04:46 +13:00
parent 127c253d40
commit 1174550191
2 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/librustc_trans/save/mod.rs
View file

@ -1121,23 +1121,23 @@ impl<'l, 'tcx, 'v> Visitor<'v> for DxrVisitor<'l, 'tcx> {
}
}
ast::ItemExternCrate(ref s) => {
let name = get_ident(item.ident);
let name = get_ident(ident);
let name = name.get();
let s = match *s {
let location = match *s {
Some((ref s, _)) => s.get().to_string(),
None => name.to_string(),
};
let sub_span = self.span.sub_span_after_keyword(item.span, keywords::Crate);
let cnum = match self.sess.cstore.find_extern_mod_stmt_cnum(item.id) {
let alias_span = self.span.span_for_last_ident(i.span);
let cnum = match self.sess.cstore.find_extern_mod_stmt_cnum(id) {
Some(cnum) => cnum,
None => 0,
};
self.fmt.extern_crate_str(item.span,
sub_span,
item.id,
self.fmt.extern_crate_str(i.span,
alias_span,
id,
cnum,
name,
&s[],
&location[],
self.cur_scope);
}
ast::ItemFn(ref decl, _, _, ref ty_params, ref body) =>

14
src/librustc_trans/save/recorder.rs
View file

@ -496,13 +496,13 @@ impl<'a> FmtStrs<'a> {
}
pub fn extern_crate_str(&mut self,
span: Span,
sub_span: Option<Span>,
id: NodeId,
cnum: ast::CrateNum,
name: &str,
loc: &str,
parent: NodeId) {
span: Span,
sub_span: Option<Span>,
id: NodeId,
cnum: ast::CrateNum,
name: &str,
loc: &str,
parent: NodeId) {
self.check_and_record(ExternCrate,
span,
sub_span,