about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJubilee <46493976+workingjubilee@users.noreply.github.com>2023-07-11 21:00:28 -0700
committerGitHub <noreply@github.com>2023-07-11 21:00:28 -0700
commit3518041a849ac52a78b32af6703227d7953d8347 (patch)
tree10db7a95b8775900964ee4db33461eb3be58edd2
parentdff07259d0af34a4b24ba2dcb6c0f7381a602532 (diff)
parent24534cffe60044965d3cd11d49e9b568c3dfa865 (diff)
downloadrust-3518041a849ac52a78b32af6703227d7953d8347.tar.gz
rust-3518041a849ac52a78b32af6703227d7953d8347.zip
Rollup merge of #113385 - joshtriplett:style-guide-cleanup-chains, r=calebcartwright
style-guide: Fix chain example to match rustfmt behavior

The style guide gave an example of breaking a multi-line chain element
and all subsequent elements to a new line, but that same example and the
accompanying text also had several chain items stacked on the first
line. rustfmt doesn't do this, except when the rule saying to combine

```
shrt
    .y()
```

into

```
shrt.y()
```

applies.

This is a bugfix to match rustfmt behavior, so it's not a breaking change, and
it just needs a ``@rust-lang/style`` reviewer to r+.
-rw-r--r--src/doc/style-guide/src/expressions.md7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/doc/style-guide/src/expressions.md b/src/doc/style-guide/src/expressions.md
index 40183063869..41a9eb82cb5 100644
--- a/src/doc/style-guide/src/expressions.md
+++ b/src/doc/style-guide/src/expressions.md
@@ -451,12 +451,11 @@ foo(
 
 #### Multi-line elements
 
-If any element in a chain is formatted across multiple lines, then that element
-and any later elements must be on their own line. Earlier elements may be kept
-on a single line. E.g.,
+If any element in a chain is formatted across multiple lines, put that element
+and any later elements on their own lines.
 
 ```rust
-a.b.c()?.d
+a.b.c()?
     .foo(
         an_expr,
         another_expr,