diff options
| author | bors <bors@rust-lang.org> | 2025-04-25 18:51:15 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-25 18:51:15 +0000 |
| commit | b4c8b0c3f0533bb342a4873ff59bdad3883ab8e3 (patch) | |
| tree | eef1aa90a79b32d1ea165af6b54170a3ca6c0468 /compiler/rustc_span/src | |
| parent | e3e432d4d65a55e6db167598e96db2bcb163e316 (diff) | |
| parent | 99dc43b7178445e3e7eacd10630dfbfadefab560 (diff) | |
| download | rust-b4c8b0c3f0533bb342a4873ff59bdad3883ab8e3.tar.gz rust-b4c8b0c3f0533bb342a4873ff59bdad3883ab8e3.zip | |
Auto merge of #140298 - matthiaskrgr:rollup-5tc1gvb, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #137683 (Add a tidy check for GCC submodule version) - #138968 (Update the index of Result to make the summary more comprehensive) - #139572 (docs(std): mention const blocks in const keyword doc page) - #140152 (Unify the format of rustc cli flags) - #140193 (fix ICE in `#[naked]` attribute validation) - #140205 (Tidying up UI tests [2/N]) - #140284 (remove expect() in `unnecessary_transmutes`) - #140290 (rustdoc: fix typo change from equivelent to equivalent) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_span/src')
| -rw-r--r-- | compiler/rustc_span/src/edition.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_span/src/edition.rs b/compiler/rustc_span/src/edition.rs index da298080ed2..28335734f4d 100644 --- a/compiler/rustc_span/src/edition.rs +++ b/compiler/rustc_span/src/edition.rs @@ -45,7 +45,7 @@ pub const ALL_EDITIONS: &[Edition] = &[ Edition::EditionFuture, ]; -pub const EDITION_NAME_LIST: &str = "2015|2018|2021|2024"; +pub const EDITION_NAME_LIST: &str = "<2015|2018|2021|2024|future>"; pub const DEFAULT_EDITION: Edition = Edition::Edition2015; |