save-analysis: don't include the crate name in fully qualified paths

diff --git a/src/librustc_trans/save/mod.rs b/src/librustc_trans/save/mod.rs
index 7e7176d661c6fa0781b79d82795af9dcc7d70d13..8e6e5590bbb35e01cd974bb66de4a5ae51846e91 100644 (file)
--- a/src/librustc_trans/save/mod.rs
+++ b/src/librustc_trans/save/mod.rs
@@ -44,7 +44,7 @@
 use syntax::parse::token::{self, get_ident, keywords};
 use syntax::owned_slice::OwnedSlice;
 use syntax::visit::{self, Visitor};
-use syntax::print::pprust::{path_to_string,ty_to_string};
+use syntax::print::pprust::{path_to_string, ty_to_string};
 use syntax::ptr::P;
 
 use self::span_utils::SpanUtils;
@@ -123,7 +123,6 @@ fn process_path_prefixes(&self, path: &ast::Path) -> Vec<(Span, String)> {
 
         let mut result: Vec<(Span, String)> = vec!();
 
-
         let mut segs = vec!();
         for (seg, span) in path.segments.iter().zip(spans.iter()) {
             segs.push(seg.clone());
@@ -1568,8 +1567,7 @@ pub fn process_crate(sess: &Session,
                         SpanUtils {
                             sess: sess,
                             err_count: Cell::new(0)
-                        },
-                        cratename.clone()),
+                        }),
         span: SpanUtils {
             sess: sess,
             err_count: Cell::new(0)

diff --git a/src/librustc_trans/save/recorder.rs b/src/librustc_trans/save/recorder.rs
index ef1eb3cb8048860b9748e2d366b32c12c011c731..0fb249eb66037814313a8f8ce598a248a19c9eb5 100644 (file)
--- a/src/librustc_trans/save/recorder.rs
+++ b/src/librustc_trans/save/recorder.rs
@@ -50,7 +50,6 @@ pub fn dump_span(&mut self,
 pub struct FmtStrs<'a> {
     pub recorder: Box<Recorder>,
     span: SpanUtils<'a>,
-    krate: String,
 }
 
 macro_rules! s { ($e:expr) => { format!("{}", $e) }}
@@ -92,11 +91,10 @@ pub enum Row {
 }
 
 impl<'a> FmtStrs<'a> {
-    pub fn new(rec: Box<Recorder>, span: SpanUtils<'a>, krate: String) -> FmtStrs<'a> {
+    pub fn new(rec: Box<Recorder>, span: SpanUtils<'a>) -> FmtStrs<'a> {
         FmtStrs {
             recorder: rec,
             span: span,
-            krate: krate,
         }
     }
 
@@ -177,16 +175,7 @@ pub fn make_values_str(&self,
         });
 
         let pairs = fields.iter().zip(values);
-        let strs = pairs.map(|(f, v)| format!(",{},\"{}\"", f, escape(
-            if *f == "qualname" && v.len() > 0 {
-                let mut n = self.krate.clone();
-                n.push_str("::");
-                n.push_str(v);
-                n
-            } else {
-                String::from_str(v)
-            }
-        )));
+        let strs = pairs.map(|(f, v)| format!(",{},\"{}\"", f, escape(String::from_str(v))));
         Some(strs.fold(String::new(), |mut s, ss| {
             s.push_str(&ss[]);
             s