コピーした英語本文を Edition Guide の最新版に追従

Author: TonalidadeHidrica

src/SUMMARY.md

@@ -107,7 +107,6 @@
   - [Rustfmt](rust-2024/rustfmt.md)
     - [Rustfmt: Style edition](rust-2024/rustfmt-style-edition.md)
     - [Rustfmt: Formatting fixes](rust-2024/rustfmt-formatting-fixes.md)
-    - [Rustfmt: Combine all delimited exprs as last argument](rust-2024/rustfmt-overflow-delimited-expr.md)
     - [Rustfmt: Raw identifier sorting](rust-2024/rustfmt-raw-identifier-sorting.md)
     - [Rustfmt: Version sorting](rust-2024/rustfmt-version-sorting.md)
 -->
@@ -141,6 +140,5 @@
   - [Rustfmt](rust-2024/rustfmt.md)
     - [Rustfmt: Style edition](rust-2024/rustfmt-style-edition.md)
     - [Rustfmt: Formatting fixes](rust-2024/rustfmt-formatting-fixes.md)
-    - [Rustfmt: Combine all delimited exprs as last argument](rust-2024/rustfmt-overflow-delimited-expr.md)
     - [Rustfmt: Raw identifier sorting](rust-2024/rustfmt-raw-identifier-sorting.md)
     - [Rustfmt: Version sorting](rust-2024/rustfmt-version-sorting.md)

src/rust-2024/prelude.md

@@ -6,7 +6,6 @@
 
 - The [`Future`] and [`IntoFuture`] traits are now part of the prelude.
 - This might make calls to trait methods ambiguous which could make some code fail to compile.
-- `RustcEncodable` and `RustcDecodable` have been removed from the prelude.
 
 [`Future`]: ../../std/future/trait.Future.html
 [`IntoFuture`]: ../../std/future/trait.IntoFuture.html
@@ -31,19 +30,6 @@ It's identical to the current one, except for the following changes:
 - Added:
     - [`std::future::Future`][`Future`]
     - [`std::future::IntoFuture`][`IntoFuture`]
-- Removed:
-    - `RustcEncodable`
-    - `RustcDecodable`
-
-### `RustcEncodable` and `RustcDecodable` removal
-
-`RustcEncodable` and `RustcDecodable` are two undocumented derive macros that have been removed from the prelude.
-These were deprecated before Rust 1.0, but remained within the standard library prelude.
-The 2024 Edition has removed these from the prelude since they are not expected to be used.
-
-If in the unlikely case there is a project still using these, it is recommended to switch to a serialization library, such as those found on [crates.io].
-
-[crates.io]: https://crates.io/categories/encoding
 
 ## Migration
 
@@ -92,15 +78,3 @@ Alternatively, you can manually enable the lint to find places where these quali
 ```
 
 [`rust_2024_prelude_collisions`]: ../../rustc/lints/listing/allowed-by-default.html#rust-2024-prelude-collisions
-
-### `RustcEncodable` and `RustcDecodable`
-
-It is strongly recommended that you migrate to a different serialization library if you are still using these.
-However, these derive macros are still available in the standard library, they are just required to be imported from the older prelude now:
-
-```rust,edition2021
-#[allow(soft_unstable)]
-use core::prelude::v1::{RustcDecodable, RustcEncodable};
-```
-
-There is no automatic migration for this change; you will need to make the update manually.

src/rust-2024/rustfmt-overflow-delimited-expr.md

@@ -70,7 +70,7 @@ The [atomic types][atomics] provide integers, pointers, and booleans that can be
 # use std::sync::atomic::Ordering;
 # use std::sync::atomic::AtomicU64;
 
-// Chnage from this:
+// Change from this:
 //   static mut COUNTER: u64 = 0;
 // to this:
 static COUNTER: AtomicU64 = AtomicU64::new(0);

src/rust-2024/static-mut-references.md

@@ -43,9 +43,9 @@ fn f(value: &RwLock<Option<bool>>) {
     }
     // <--- Read lock is dropped here in 2024
     else {
-        let mut s = value.write().unwrap();
-        if s.is_none() {
-            *s = Some(true);
+        let mut v = value.write().unwrap();
+        if v.is_none() {
+            *v = Some(true);
         }
     }
 }