Skip to content

Commit 603b946

Browse files
committed
---
yaml --- r: 145235 b: refs/heads/try2 c: 823ebb1 h: refs/heads/master i: 145233: d123cf3 145231: 240d42d v: v3
1 parent 58279f8 commit 603b946

File tree

4 files changed

+21
-10
lines changed

4 files changed

+21
-10
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: aa406c151e7404029760e56338f9ebc92319a5d5
8+
refs/heads/try2: 823ebb14ba6ed99df1198c6d1b47c5d2964196da
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/libsyntax/print/pprust.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1535,15 +1535,15 @@ fn print_path_(s: @ps,
15351535

15361536
print_ident(s, segment.identifier);
15371537

1538-
if segment.lifetime.is_some() || !segment.types.is_empty() {
1539-
// If this is the last segment, print the bounds.
1540-
if i == path.segments.len() - 1 {
1541-
match *opt_bounds {
1542-
None => {}
1543-
Some(ref bounds) => print_bounds(s, bounds, true),
1544-
}
1538+
// If this is the last segment, print the bounds.
1539+
if i == path.segments.len() - 1 {
1540+
match *opt_bounds {
1541+
None => {}
1542+
Some(ref bounds) => print_bounds(s, bounds, true),
15451543
}
1544+
}
15461545

1546+
if segment.lifetime.is_some() || !segment.types.is_empty() {
15471547
if colons_before_params {
15481548
word(s.s, "::")
15491549
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
// pp-exact
2+
3+
trait Tr { }
4+
impl Tr for int;
5+
6+
fn foo(x: ~Tr: Freeze) -> ~Tr: Freeze { x }
7+
8+
fn main() {
9+
let x: ~Tr: Freeze;
10+
11+
~1 as ~Tr: Freeze;
12+
}
13+

branches/try2/src/test/run-pass/issue-7673-cast-generically-implemented-trait.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// xfail-pretty #9253 pretty printer doesn't preserve the bounds on trait objects
12-
1311
/*
1412
1513
#7673 Polymorphically creating traits barely works

0 commit comments

Comments
 (0)