about summary refs log tree commit diff
path: root/src/doc
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2023-07-12 06:03:53 +0000
committerbors <bors@rust-lang.org>2023-07-12 06:03:53 +0000
commit6732922ea6d0fcfd4f1ad60d3f8d2fb554753aae (patch)
tree4153c19c9e3fd101c31c145968c4f305a358c7af /src/doc
parent993deaa0bf8bab9dd3eadfd1fbeb093328e95afe (diff)
parentf05e6e633172d634cc66933454b4e0743013fe1c (diff)
downloadrust-6732922ea6d0fcfd4f1ad60d3f8d2fb554753aae.tar.gz
rust-6732922ea6d0fcfd4f1ad60d3f8d2fb554753aae.zip
Auto merge of #113608 - workingjubilee:rollup-8763ius, r=workingjubilee
Rollup of 5 pull requests

Successful merges:

 - #113373 (various download-rustc fixes)
 - #113385 (style-guide: Fix chain example to match rustfmt behavior)
 - #113567 (While let suggestion will work for closure body)
 - #113579 (Revert "fix: :bug: etc/bash_complettion -> src/etc/... to avoid copy …)
 - #113595 (Use constants from object crate)

r? `@ghost`
`@rustbot` modify labels: rollup
Diffstat (limited to 'src/doc')
-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,