Skip to content

Commit c62c908

Browse files
committed
Correct pretty-printing of type Foo<T> where T: Bound = ...;
Fix rust-lang#25031
1 parent 6517a0e commit c62c908

File tree

2 files changed

+18
-1
lines changed

2 files changed

+18
-1
lines changed

Diff for: src/libsyntax/print/pprust.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -903,10 +903,10 @@ impl<'a> State<'a> {
903903
try!(self.print_generics(params));
904904
try!(self.end()); // end the inner ibox
905905

906+
try!(self.print_where_clause(&params.where_clause));
906907
try!(space(&mut self.s));
907908
try!(self.word_space("="));
908909
try!(self.print_type(&**ty));
909-
try!(self.print_where_clause(&params.where_clause));
910910
try!(word(&mut self.s, ";"));
911911
try!(self.end()); // end the outer ibox
912912
}

Diff for: src/test/pretty/issue-25031.rs

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright 2015 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+
// Testing that type items with where clauses output correctly.
12+
13+
// pp-exact
14+
15+
fn main() {
16+
type Foo<T> where T: Copy = Box<T>;
17+
}

0 commit comments

Comments
 (0)