Skip to content

Commit

Permalink
save-analysis: two minor bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
nrc committed Nov 24, 2014
1 parent 4e52595 commit bbe1a9b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion src/librustc_trans/save/recorder.rs
Expand Up @@ -171,7 +171,7 @@ impl<'a> FmtStrs<'a> {

let pairs = fields.iter().zip(values);
let mut strs = pairs.map(|(f, v)| format!(",{},\"{}\"", f, escape(
if *f == "qualname" {
if *f == "qualname" && v.len() > 0 {
let mut n = self.krate.clone();
n.push_str("::");
n.push_str(v);
Expand Down
1 change: 0 additions & 1 deletion src/librustc_trans/save/span_utils.rs
Expand Up @@ -293,7 +293,6 @@ impl<'a> SpanUtils<'a> {
if ts.tok == token::Eof {
return None
} else {
println!("found keyword: {} at {}", ts, ts.sp);
return self.make_sub_span(span, Some(ts.sp));
}
}
Expand Down

5 comments on commit bbe1a9b

@bors
Copy link
Contributor

@bors bors commented on bbe1a9b Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from brson
at nrc@bbe1a9b

@bors
Copy link
Contributor

@bors bors commented on bbe1a9b Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging nick29581/rust/dxr-minor = bbe1a9b into auto

@bors
Copy link
Contributor

@bors bors commented on bbe1a9b Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nick29581/rust/dxr-minor = bbe1a9b merged ok, testing candidate = 54c628c

@bors
Copy link
Contributor

@bors bors commented on bbe1a9b Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on bbe1a9b Nov 24, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = 54c628c

Please sign in to comment.