diff --git a/src/items.rs b/src/items.rs
index e2484f8298e..19a2a118e8b 100644
--- a/src/items.rs
+++ b/src/items.rs
@@ -793,7 +793,8 @@ impl<'a> FmtVisitor<'a> {
         let header_str = self.format_header(item_name, ident, vis);
         result.push_str(&header_str);
         result.push(';');
-        return Some(result);
+
+        Some(result)
     }
 
     fn format_struct_struct(&self,
@@ -968,8 +969,8 @@ impl<'a> FmtVisitor<'a> {
                                                                       terminator,
                                                                       Some(span.hi)));
             result.push_str(&where_clause_str);
-            result.push_str(&self.block_indent.to_string(self.config));
             result.push('\n');
+            result.push_str(&self.block_indent.to_string(self.config));
             result.push_str(opener);
         } else {
             result.push(' ');
diff --git a/tests/source/structs.rs b/tests/source/structs.rs
index a4e377f154e..9a559e029db 100644
--- a/tests/source/structs.rs
+++ b/tests/source/structs.rs
@@ -135,3 +135,9 @@ struct Foo<T>(TTTTTTTTTTTTTTTTT, // Foo
               TTTTTTTTTTTTTTTTTTT,
               // Qux (FIXME #572 - doc comment)
               UUUUUUUUUUUUUUUUUUU);
+
+mod m {
+    struct X<T> where T: Sized {
+        a: T,
+    }
+}
diff --git a/tests/target/structs.rs b/tests/target/structs.rs
index a79663b0fed..50090b7a5f4 100644
--- a/tests/target/structs.rs
+++ b/tests/target/structs.rs
@@ -141,3 +141,11 @@ struct Foo<T>(TTTTTTTTTTTTTTTTT, // Foo
               TTTTTTTTTTTTTTTTTTT,
               // Qux (FIXME #572 - doc comment)
               UUUUUUUUUUUUUUUUUUU);
+
+mod m {
+    struct X<T>
+        where T: Sized
+    {
+        a: T,
+    }
+}