summary refs log tree commit diff
diff options
context:
space:
mode:
authorMatthew Esposito <matt@matthew.science>2023-01-06 14:07:12 -0500
committerMatthew Esposito <matt@matthew.science>2023-01-06 14:07:12 -0500
commit5cda0a2f39930daaeb1e71e9027be0e28fe55cfd (patch)
treeeba9271386b8d7acf7f125f0088bbd80139923f1
parentafe8c4537c9009a251a31e8f022b7795fc305d4f (diff)
downloadrust-5cda0a2f39930daaeb1e71e9027be0e28fe55cfd.tar.gz
rust-5cda0a2f39930daaeb1e71e9027be0e28fe55cfd.zip
Add default and latest stable edition to --edition in rustc
-rw-r--r--compiler/rustc_session/src/config.rs10
1 files changed, 8 insertions, 2 deletions
diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
index a87e820386e..233343febff 100644
--- a/compiler/rustc_session/src/config.rs
+++ b/compiler/rustc_session/src/config.rs
@@ -35,6 +35,7 @@ use std::hash::Hash;
 use std::iter;
 use std::path::{Path, PathBuf};
 use std::str::{self, FromStr};
+use std::sync::LazyLock;
 
 pub mod sigpipe;
 
@@ -1322,7 +1323,12 @@ mod opt {
         unstable(longer(a, b), move |opts| opts.optmulti(a, b, c, d))
     }
 }
-
+static EDITION_STRING: LazyLock<String> = LazyLock::new(|| {
+    format!(
+        "Specify which edition of the compiler to use when compiling code.\
+The default is {DEFAULT_EDITION} and the latest stable edition is {LATEST_STABLE_EDITION}."
+    )
+});
 /// Returns the "short" subset of the rustc command line options,
 /// including metadata for each option, such as whether the option is
 /// part of the stable long-term interface for rustc.
@@ -1355,7 +1361,7 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
         opt::opt_s(
             "",
             "edition",
-            "Specify which edition of the compiler to use when compiling code.",
+            &*EDITION_STRING,
             EDITION_NAME_LIST,
         ),
         opt::multi_s(