about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-03-28 13:35:38 +0100
committerGitHub <noreply@github.com>2019-03-28 13:35:38 +0100
commitf591d25f431370ec26e1e8a885fa8ad2bdd9c68f (patch)
treede716194867f6fc1da026dceab6534cb27ef198e
parent9ca8f6aa796e97dec28f6cc2665d2fd3356d97ba (diff)
parent3eb4eae96d2e400c2a99146491367bffa34ba29e (diff)
downloadrust-f591d25f431370ec26e1e8a885fa8ad2bdd9c68f.tar.gz
rust-f591d25f431370ec26e1e8a885fa8ad2bdd9c68f.zip
Rollup merge of #59363 - peterjoel:issue_59361_edition_opt_shortlist, r=nagisa
#59361 Moved rustc edition opt to short list

Addresses #59361, in case that issue is accepted.
-rw-r--r--src/librustc/session/config.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/librustc/session/config.rs b/src/librustc/session/config.rs
index 0ae7c10cf56..eb629dc44c1 100644
--- a/src/librustc/session/config.rs
+++ b/src/librustc/session/config.rs
@@ -1706,6 +1706,12 @@ pub fn rustc_short_optgroups() -> Vec<RustcOptGroup> {
             "Specify the name of the crate being built",
             "NAME",
         ),
+        opt::opt_s(
+            "",
+            "edition",
+            "Specify which edition of the compiler to use when compiling code.",
+            EDITION_NAME_LIST,
+        ),
         opt::multi_s(
             "",
             "emit",
@@ -1808,12 +1814,6 @@ pub fn rustc_optgroups() -> Vec<RustcOptGroup> {
                   `expanded,identified` (fully parenthesized, AST nodes with IDs).",
             "TYPE",
         ),
-        opt::opt_s(
-            "",
-            "edition",
-            "Specify which edition of the compiler to use when compiling code.",
-            EDITION_NAME_LIST,
-        ),
         opt::multi_s(
             "",
             "remap-path-prefix",