---

yaml
---
r: 177578
b: refs/heads/auto
c: 1174550
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 127c253d404cf6c62f1f761c57a78d9b20beebe2
+refs/heads/auto: 1174550191970b0af762f4289c85d499da52d299
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/src/librustc_trans/save/mod.rs

@@ -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) =>

branches/auto/src/librustc_trans/save/recorder.rs

@@ -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,