about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2015-05-05 04:47:56 +0000
committerbors <bors@rust-lang.org>2015-05-05 04:47:56 +0000
commit31e3cb7c4e8895fff23aa67e1cd6b58d798cdac4 (patch)
tree5c8ab399eb799e89b424309a7e0226242340516a /src/libsyntax
parent0be117e2733423e70bccd8b0a46e8eccd1e1d1cc (diff)
parent135502ef0016fd6b17324cc1ed4e088863a97176 (diff)
downloadrust-31e3cb7c4e8895fff23aa67e1cd6b58d798cdac4.tar.gz
rust-31e3cb7c4e8895fff23aa67e1cd6b58d798cdac4.zip
Auto merge of #25111 - Manishearth:rollup, r=Manishearth
r? @Manishearth
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ast.rs2
-rw-r--r--src/libsyntax/print/pprust.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 3b7bfb1043a..e00cb82649b 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -595,7 +595,7 @@ pub enum Pat_ {
 
     /// An associated const named using the qualified path `<T>::CONST` or
     /// `<T as Trait>::CONST`. Associated consts from inherent impls can be
-    /// refered to as simply `T::CONST`, in which case they will end up as
+    /// referred to as simply `T::CONST`, in which case they will end up as
     /// PatEnum, and the resolver will have to sort that out.
     PatQPath(QSelf, Path),
 
diff --git a/src/libsyntax/print/pprust.rs b/src/libsyntax/print/pprust.rs
index 87c164f7550..5c1f6cc12f5 100644
--- a/src/libsyntax/print/pprust.rs
+++ b/src/libsyntax/print/pprust.rs
@@ -903,10 +903,10 @@ impl<'a> State<'a> {
                 try!(self.print_generics(params));
                 try!(self.end()); // end the inner ibox
 
+                try!(self.print_where_clause(&params.where_clause));
                 try!(space(&mut self.s));
                 try!(self.word_space("="));
                 try!(self.print_type(&**ty));
-                try!(self.print_where_clause(&params.where_clause));
                 try!(word(&mut self.s, ";"));
                 try!(self.end()); // end the outer ibox
             }