user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

auto merge of #9264 : ben0x539/rust/pp-work, r=alexcrichton

Browse source 
Since 3b6314c the pretty printer seems to only print trait bounds for `ast::ty_path(...)`s that have a generics arguments list. That seems wrong, so let's always print them.

Closes #9253, un-xfails test for #7673.
This commit is contained in:
bors 2013-09-18 04:15:56 -07:00
commit b8d3496528
4 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libsyntax/print/pp.rs
View file

@ -243,7 +243,7 @@ pub fn mk_printer(out: @io::Writer, linewidth: uint) -> @mut Printer {
* the entire buffered window, but can't output anything until the size is >=
* 0 (sizes are set to negative while they're pending calculation).
*
* So SCAN takeks input and buffers tokens and pending calculations, while
* So SCAN takes input and buffers tokens and pending calculations, while
* PRINT gobbles up completed calculations and tokens from the buffer. The
* theory is that the two can never get more than 3N tokens apart, because
* once there's "obviously" too much data to fit on a line, in a size

14
src/libsyntax/print/pprust.rs
View file

@ -1535,15 +1535,15 @@ fn print_path_(s: @ps,
print_ident(s, segment.identifier);
if segment.lifetime.is_some() || !segment.types.is_empty() {
// If this is the last segment, print the bounds.
if i == path.segments.len() - 1 {
match *opt_bounds {
None => {}
Some(ref bounds) => print_bounds(s, bounds, true),
}
// If this is the last segment, print the bounds.
if i == path.segments.len() - 1 {
match *opt_bounds {
None => {}
Some(ref bounds) => print_bounds(s, bounds, true),
}
}
if segment.lifetime.is_some() || !segment.types.is_empty() {
if colons_before_params {
word(s.s, "::")
}