Merge pull request #118 from rust-lang-nursery/misc-2

assignment ops, impls, and `|` in match patterns

Author: nrc

guide/expressions.md

@@ -284,7 +284,8 @@ between a unary operator and its operand.
 
 ### Binary operations
 
-Do include spaces around binary ops (i.e., `x + 1`, not `x+1`) (including `=`).
+Do include spaces around binary ops (i.e., `x + 1`, not `x+1`) (including `=`
+and other assignment operators such as `+=` or `*=`).
 
 For comparison operators, because for `T op U`, `&T op &U` is also implemented:
 if you have `t: &T`, and `u: U`, prefer `*t op u` to `t op &u`. In general,
@@ -301,6 +302,9 @@ foo + bar + baz
     + qux + whatever
 ```
 
+Prefer line-breaking at an assignment operator (either `=` or `+=`, etc.) rather
+than at other binary operators.
+
 ### Control flow
 
 Do not include extraneous parentheses for `if` and `while` expressions.
@@ -585,8 +589,8 @@ body on a new line:
 ```
 
 If required to break the pattern, put each clause of the pattern on its own
-line, breaking before the `|`. If there is an `if` clause, then you must use the
-above form:
+line with no additional indent, breaking before the `|`. If there is an `if`
+clause, then you must use the above form:
 
 ```rust
     a_very_long_pattern

guide/items.md

@@ -198,12 +198,40 @@ pub trait IndexRanges:
 ```
 
 
+### Impls
+
+Impl items should be block indented. If there are no items, the impl may be
+formatted on a single line. Otherwise there should be line-breaks after the
+opening brace and before the closing brace:
+
+```rust
+impl Foo {}
+
+impl Bar for Foo {
+    ...
+}
+```
+
+Avoid line-breaking in the signature if possible. If a line break is required in
+a non-inherent impl, break immediately before `for`, block indent the concrete type
+and put the opening brace on it's own line:
+
+```rust
+impl Bar
+    for Foo
+{
+    ...
+}
+```
+
+
 ### Extern crate
 
 `extern crate foo;`
 
 Use spaces around keywords, no spaces around the semi-colon.
 
+
 ### Modules
 
 ```rust