Auto merge of #70865 - Dylan-DPC:rollup-jje2cuv, r=Dylan-DPC

Rollup of 5 pull requests

Successful merges:

 - #70612 (Add io::Write::write_all_vectored)
 - #70690 (Clean up E0501 explanation)
 - #70821 (expose suggestions::InferCtxtExt for clippy)
 - #70839 (clean up E0506 explanation)
 - #70859 (Move sanitize-inline-always test to sanitize directory)

Failed merges:

r? @ghost

2 files changed, 37 insertions, 43 deletions

diff --git a/src/librustc_error_codes/error_codes/E0501.md b/src/librustc_error_codes/error_codes/E0501.md
index f5aa17a8094..ffdbc443905 100644
--- a/src/librustc_error_codes/error_codes/E0501.md
+++ b/src/librustc_error_codes/error_codes/E0501.md
@@ -1,12 +1,4 @@
-This error indicates that a mutable variable is being used while it is still
-captured by a closure. Because the closure has borrowed the variable, it is not
-available for use until the closure goes out of scope.
-
-Note that a capture will either move or borrow a variable, but in this
-situation, the closure is borrowing the variable. Take a look at the chapter
-on [Capturing][capturing] in Rust By Example for more information.
-
-[capturing]: https://doc.rust-lang.org/stable/rust-by-example/fn/closures/capture.html
+A mutable variable is used but it is already captured by a closure.
 
 Erroneous code example:
 
@@ -29,6 +21,16 @@ fn foo(a: &mut i32) {
 }
 ```
 
+This error indicates that a mutable variable is used while it is still captured
+by a closure. Because the closure has borrowed the variable, it is not available
+until the closure goes out of scope.
+
+Note that a capture will either move or borrow a variable, but in this
+situation, the closure is borrowing the variable. Take a look at the chapter
+on [Capturing][capturing] in Rust By Example for more information.
+
+[capturing]: https://doc.rust-lang.org/stable/rust-by-example/fn/closures/capture.html
+
 To fix this error, you can finish using the closure before using the captured
 variable:
 
diff --git a/src/librustc_error_codes/error_codes/E0506.md b/src/librustc_error_codes/error_codes/E0506.md
index 9b8e3164872..c312a0460e3 100644
--- a/src/librustc_error_codes/error_codes/E0506.md
+++ b/src/librustc_error_codes/error_codes/E0506.md
@@ -1,4 +1,4 @@
-This error occurs when an attempt is made to assign to a borrowed value.
+An attempt was made to assign to a borrowed value.
 
 Erroneous code example:
 
@@ -7,14 +7,12 @@ struct FancyNum {
     num: u8,
 }
 
-fn main() {
-    let mut fancy_num = FancyNum { num: 5 };
-    let fancy_ref = &fancy_num;
-    fancy_num = FancyNum { num: 6 };
-    // error: cannot assign to `fancy_num` because it is borrowed
+let mut fancy_num = FancyNum { num: 5 };
+let fancy_ref = &fancy_num;
+fancy_num = FancyNum { num: 6 };
+// error: cannot assign to `fancy_num` because it is borrowed
 
-    println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num);
-}
+println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num);
 ```
 
 Because `fancy_ref` still holds a reference to `fancy_num`, `fancy_num` can't
@@ -27,13 +25,11 @@ struct FancyNum {
     num: u8,
 }
 
-fn main() {
-    let mut fancy_num = FancyNum { num: 5 };
-    let moved_num = fancy_num;
-    fancy_num = FancyNum { num: 6 };
+let mut fancy_num = FancyNum { num: 5 };
+let moved_num = fancy_num;
+fancy_num = FancyNum { num: 6 };
 
-    println!("Num: {}, Moved num: {}", fancy_num.num, moved_num.num);
-}
+println!("Num: {}, Moved num: {}", fancy_num.num, moved_num.num);
 ```
 
 If the value has to be borrowed, try limiting the lifetime of the borrow using
@@ -44,18 +40,16 @@ struct FancyNum {
     num: u8,
 }
 
-fn main() {
-    let mut fancy_num = FancyNum { num: 5 };
-
-    {
-        let fancy_ref = &fancy_num;
-        println!("Ref: {}", fancy_ref.num);
-    }
+let mut fancy_num = FancyNum { num: 5 };
 
-    // Works because `fancy_ref` is no longer in scope
-    fancy_num = FancyNum { num: 6 };
-    println!("Num: {}", fancy_num.num);
+{
+    let fancy_ref = &fancy_num;
+    println!("Ref: {}", fancy_ref.num);
 }
+
+// Works because `fancy_ref` is no longer in scope
+fancy_num = FancyNum { num: 6 };
+println!("Num: {}", fancy_num.num);
 ```
 
 Or by moving the reference into a function:
@@ -65,17 +59,15 @@ struct FancyNum {
     num: u8,
 }
 
-fn main() {
-    let mut fancy_num = FancyNum { num: 5 };
-
-    print_fancy_ref(&fancy_num);
-
-    // Works because function borrow has ended
-    fancy_num = FancyNum { num: 6 };
-    println!("Num: {}", fancy_num.num);
-}
-
 fn print_fancy_ref(fancy_ref: &FancyNum){
     println!("Ref: {}", fancy_ref.num);
 }
+
+let mut fancy_num = FancyNum { num: 5 };
+
+print_fancy_ref(&fancy_num);
+
+// Works because function borrow has ended
+fancy_num = FancyNum { num: 6 };
+println!("Num: {}", fancy_num.num);
 ```