Skip to content

Commit ebbb393

Browse files
committed
---
yaml --- r: 83950 b: refs/heads/dist-snap c: 376d5d6 h: refs/heads/master v: v3
1 parent eff0919 commit ebbb393

File tree

5 files changed

+21
-4
lines changed

5 files changed

+21
-4
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: 0983ebe5310d4eb6d289f636f7ed0536c08bbc0e
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
9-
refs/heads/dist-snap: 30fca57f17dea0b32500937bf80ab1039c50f9f1
9+
refs/heads/dist-snap: 376d5d6aae9a448a0f58a9a98e8dcec9eeeaece7
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1212
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/test/compile-fail/issue-3044.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ fn main() {
1212
let needlesArr: ~[char] = ~['a', 'f'];
1313
do needlesArr.iter().fold() |x, y| {
1414
}
15-
//~^ ERROR 1 parameter was supplied (including the closure passed by the `do` keyword)
15+
//~^^ ERROR 1 parameter was supplied (including the closure passed by the `do` keyword)
1616
//
1717
// the first error is, um, non-ideal.
1818
}

branches/dist-snap/src/test/pretty/block-comment-wchar.pp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,6 @@
108108
'\xA0', '\u1680', '\u180E', '\u2000', '\u2001', '\u2002', '\u2003',
109109
'\u2004', '\u2005', '\u2006', '\u2007', '\u2008', '\u2009', '\u200A',
110110
'\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
111-
// <= bugs in pretty-printer?
112111
for chars.iter().advance |c| {
113112
let ws = c.is_whitespace();
114113
println(fmt!("%? %?" , c , ws));

branches/dist-snap/src/test/pretty/block-comment-wchar.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,6 @@ fn main() {
104104
'\u2028', '\u2029', '\u202F', '\u205F', '\u3000'];
105105
for chars.iter().advance |c| {
106106
let ws = c.is_whitespace();
107-
println(fmt!("%? %?", c , ws)); // <= bugs in pretty-printer?
107+
println(fmt!("%? %?", c , ws));
108108
}
109109
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
// Copyright 2013 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
// pp-exact
12+
13+
fn f(v: &[int]) {
14+
let mut n = 0;
15+
for v.iter().advance |e| {
16+
n = *e; // This comment once triggered pretty printer bug
17+
}
18+
}

0 commit comments

Comments
 (0)