diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2013-06-24 13:30:35 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2013-07-08 13:55:11 -0400 |
| commit | 979d3a54f9e1eea483734059a2f594278787e16a (patch) | |
| tree | e385d1b804a9c3d44281570a3ac8a942b66786db /src/libsyntax | |
| parent | ce602c66b8ff487ca74f074120419a18c9f25871 (diff) | |
| download | rust-979d3a54f9e1eea483734059a2f594278787e16a.tar.gz rust-979d3a54f9e1eea483734059a2f594278787e16a.zip | |
Correct merge failures
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/print/pprust.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs index 73ee8768ca3..f9504a696ce 100644 --- a/src/libsyntax/print/pprust.rs +++ b/src/libsyntax/print/pprust.rs @@ -1521,7 +1521,12 @@ pub fn print_path(s: @ps, path: &ast::Path, colons_before_params: bool) { print_path_(s, path, colons_before_params, &None) } -pub fn print_pat(s: @ps, pat: &ast::pat) { +pub fn print_bounded_path(s: @ps, path: &ast::Path, + bounds: &Option<OptVec<ast::TyParamBound>>) { + print_path_(s, path, false, bounds) +} + +pub fn print_pat(s: @ps, pat: @ast::pat) { maybe_print_comment(s, pat.span.lo); let ann_node = node_pat(s, pat); (s.ann.pre)(ann_node); |