Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit f5be3ca

Browse files
committedNov 22, 2024
Auto merge of rust-lang#133349 - ehuss:stabilize-2024, r=traviscross,compiler-errors
Stabilize the 2024 edition This stabilizes the 2024 edition for Rust 1.85, scheduled to be released on February 20, 2025. 🎉 cc tracking issue: rust-lang#117258 There is a fair amount of follow-up work after this that I am working on (various docs, cargo, rustfmt, etc.), and this is will unblock those other changes.
2 parents a475551 + 31c9222 commit f5be3ca

File tree

116 files changed

+308
-334
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+308
-334
lines changed
 

‎compiler/rustc_span/src/edition.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ pub const EDITION_NAME_LIST: &str = "2015|2018|2021|2024";
3333

3434
pub const DEFAULT_EDITION: Edition = Edition::Edition2015;
3535

36-
pub const LATEST_STABLE_EDITION: Edition = Edition::Edition2021;
36+
pub const LATEST_STABLE_EDITION: Edition = Edition::Edition2024;
3737

3838
impl fmt::Display for Edition {
3939
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
@@ -62,7 +62,7 @@ impl Edition {
6262
Edition::Edition2015 => true,
6363
Edition::Edition2018 => true,
6464
Edition::Edition2021 => true,
65-
Edition::Edition2024 => false,
65+
Edition::Edition2024 => true,
6666
}
6767
}
6868

‎src/doc/rustc/src/command-line-arguments.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ This informs `rustc` of the name of your crate.
179179
<a id="option-edition"></a>
180180
## `--edition`: specify the edition to use
181181

182-
This flag takes a value of `2015`, `2018` or `2021`. The default is `2015`. More
182+
This flag takes a value of `2015`, `2018`,`2021`, or `2024`. The default is `2015`. More
183183
information about editions may be found in the [edition guide].
184184

185185
[edition guide]: ../edition-guide/introduction.html

0 commit comments

Comments
 (0)
Please sign in to comment.