Skip to content

Commit

Permalink
Fix fallout from span change
Browse files Browse the repository at this point in the history
  • Loading branch information
sanxiyn committed Jul 5, 2013
1 parent 30fca57 commit 376d5d6
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 3 deletions.
2 changes: 1 addition & 1 deletion src/test/compile-fail/issue-3044.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ fn main() {
let needlesArr: ~[char] = ~['a', 'f'];
do needlesArr.iter().fold() |x, y| {
}
//~^ ERROR 1 parameter was supplied (including the closure passed by the `do` keyword)
//~^^ ERROR 1 parameter was supplied (including the closure passed by the `do` keyword)
//
// the first error is, um, non-ideal.
}
1 change: 0 additions & 1 deletion src/test/pretty/block-comment-wchar.pp
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@
'\xA0', '\u1680', '\u180E', '\u2000', '\u2001', '\u2002', '\u2003',
'\u2004', '\u2005', '\u2006', '\u2007', '\u2008', '\u2009', '\u200A',
'\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
// <= bugs in pretty-printer?
for chars.iter().advance |c| {
let ws = c.is_whitespace();
println(fmt!("%? %?" , c , ws));
Expand Down
2 changes: 1 addition & 1 deletion src/test/pretty/block-comment-wchar.rs
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,6 @@ fn main() {
'\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
for chars.iter().advance |c| {
let ws = c.is_whitespace();
println(fmt!("%? %?", c , ws)); // <= bugs in pretty-printer?
println(fmt!("%? %?", c , ws));
}
}
Expand Down
18 changes: 18 additions & 0 deletions src/test/pretty/for-comment.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
// file at the top-level directory of this distribution and at
// http://rust-lang.org/COPYRIGHT.
//
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
// option. This file may not be copied, modified, or distributed
// except according to those terms.

// pp-exact

fn f(v: &[int]) {
let mut n = 0;
for v.iter().advance |e| {
n = *e; // This comment once triggered pretty printer bug
}
}

9 comments on commit 376d5d6

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 5, 2013

Choose a reason for hiding this comment

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

saw approval from sanxiyn
at sanxiyn@376d5d6

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 5, 2013

Choose a reason for hiding this comment

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

merging sanxiyn/rust/rollup-1 = 376d5d6 into auto

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 5, 2013

Choose a reason for hiding this comment

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

sanxiyn/rust/rollup-1 = 376d5d6 merged ok, testing candidate = 98ce2c84

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 5, 2013

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 376d5d6 Jul 6, 2013

Choose a reason for hiding this comment

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

saw approval from sanxiyn
at sanxiyn@376d5d6

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 6, 2013

Choose a reason for hiding this comment

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

merging sanxiyn/rust/rollup-1 = 376d5d6 into auto

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 6, 2013

Choose a reason for hiding this comment

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

sanxiyn/rust/rollup-1 = 376d5d6 merged ok, testing candidate = e9897cd

@bors
Copy link
Contributor

@bors bors commented on 376d5d6 Jul 6, 2013

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 = e9897cd

Please sign in to comment.