Skip to content

Commit 7a46c7b

Browse files
committed
Revert "Rollup merge of rust-lang#119838 - joshtriplett:style-guide-binop-indent, r=compiler-errors"
This reverts commit 3628783, reversing changes made to 31026b7.
1 parent a6ba04a commit 7a46c7b

File tree

2 files changed

+0
-33
lines changed

2 files changed

+0
-33
lines changed

src/doc/style-guide/src/editions.md

-2
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,6 @@ include:
4040
of a delimited expression, delimited expressions are generally combinable,
4141
regardless of the number of members. Previously only applied with exactly
4242
one member (except for closures with explicit blocks).
43-
- When line-breaking a binary operator, if the first operand spans multiple
44-
lines, use the base indentation of the last line.
4543
- Miscellaneous `rustfmt` bugfixes.
4644
- Use version-sort (sort `x8`, `x16`, `x32`, `x64`, `x128` in that order).
4745
- Change "ASCIIbetical" sort to Unicode-aware "non-lowercase before lowercase".

src/doc/style-guide/src/expressions.md

-31
Original file line numberDiff line numberDiff line change
@@ -328,37 +328,6 @@ foo_bar
328328
Prefer line-breaking at an assignment operator (either `=` or `+=`, etc.) rather
329329
than at other binary operators.
330330

331-
If line-breaking at a binary operator (including assignment operators) where the
332-
first operand spans multiple lines, use the base indentation of the *last*
333-
line of the first operand, and indent relative to that:
334-
335-
```rust
336-
impl SomeType {
337-
fn method(&mut self) {
338-
self.array[array_index as usize]
339-
.as_mut()
340-
.expect("thing must exist")
341-
.extra_info =
342-
long_long_long_long_long_long_long_long_long_long_long_long_long_long_long;
343-
344-
self.array[array_index as usize]
345-
.as_mut()
346-
.expect("thing must exist")
347-
.extra_info
348-
+ long_long_long_long_long_long_long_long_long_long_long_long_long_long_long;
349-
350-
self.array[array_index as usize]
351-
.as_mut()
352-
.expect("thing must exist")
353-
.extra_info = Some(ExtraInfo {
354-
parent,
355-
count: count as u16,
356-
children: children.into_boxed_slice(),
357-
});
358-
}
359-
}
360-
```
361-
362331
### Casts (`as`)
363332

364333
Format `as` casts like a binary operator. In particular, always include spaces

0 commit comments

Comments
 (0)