Merge from rustc

8 files changed, 13 insertions, 4 deletions

diff --git a/src/doc/book b/src/doc/book
-Subproject 21cf840842bdf768a798869f06373c96c1cc512
+Subproject 668c64760b5c7ea654facb4ba5fe9faddfda27c
diff --git a/src/doc/edition-guide b/src/doc/edition-guide
-Subproject f63e578b92ff43e8cc38fcaa257b660f45c8a8c
+Subproject 2751bdcef125468ea2ee006c11992cd1405aebe
diff --git a/src/doc/embedded-book b/src/doc/embedded-book
-Subproject f2aed2fe8e9f55508c86ba3aa4b6789b18a08a2
+Subproject 1e5556dd1b864109985d5871616ae6b9164bcea
diff --git a/src/doc/nomicon b/src/doc/nomicon
-Subproject c369e4b489332f8721fbae630354fa83385d457
+Subproject 302b995bcb24b70fd883980fd174738c3a10b70
diff --git a/src/doc/reference b/src/doc/reference
-Subproject 5ca365eac678cb0d41a20b3204546d6ed70c717
+Subproject 1ea0178266b3f3f613b0fabdaf16a83961c99cd
diff --git a/src/doc/rust-by-example b/src/doc/rust-by-example
-Subproject 57636d6926762861f34e030d52ca25a71e95e5b
+Subproject 8a87926a985ce32ca1fad1be4008ee161a0b91e
diff --git a/src/doc/rustc-dev-guide b/src/doc/rustc-dev-guide
-Subproject 17fe3e948498c50e208047a750f17d6a8d89669
+Subproject b5a12d95e32ae53791cc6ab44417774667ed2ac
diff --git a/src/doc/style-guide/src/expressions.md b/src/doc/style-guide/src/expressions.md
index 143161da6cf..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,
@@ -803,6 +802,16 @@ foo(|param| {
     action();
     foo(param)
 })
+
+let x = combinable([
+    an_expr,
+    another_expr,
+]);
+
+let arr = [combinable(
+    an_expr,
+    another_expr,
+)];
 ```
 
 Such behaviour should extend recursively, however, tools may choose to limit the