Merge pull request #3064 from zohnannor/bump-clap

Bump `clap` to 3.0
rust-lang · Mar 5, 2023 · affbdfe · affbdfe
2 parents de9a9f0 + dae8b6a
commit affbdfe
Show file tree

Hide file tree

Showing 53 changed files with 891 additions and 823 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,6 +3,7 @@
 /Cargo.lock
 /.settings
 /.idea/
+/.vscode/
 *~
 /**/target
 /home

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,8 @@ no-self-update = []
 anyhow.workspace = true
 cfg-if = "1.0"
 chrono = "0.4"
-clap = {version = "2", features = ["wrap_help"]}
+clap = {version = "3", features = ["wrap_help"]}
+clap_complete = "3"
 download = {path = "download", default-features = false}
 effective-limits = "0.5.5"
 enum-map = "2.4.2"

diff --git a/rustup-init.sh b/rustup-init.sh
@@ -29,25 +29,44 @@ rustup-init 1.25.2 (8c4dad73d 2023-02-01)
 The installer for rustup
 
 USAGE:
-    rustup-init [FLAGS] [OPTIONS]
-
-FLAGS:
-    -v, --verbose                        Enable verbose output
-    -q, --quiet                          Disable progress output
-    -y                                   Disable confirmation prompt.
-        --no-update-default-toolchain    Don't update any existing default toolchain after install
-        --no-modify-path                 Don't configure the PATH environment variable
-    -h, --help                           Prints help information
-    -V, --version                        Prints version information
+    rustup-init [OPTIONS]
 
 OPTIONS:
-        --default-host <default-host>              Choose a default host triple
+    -v, --verbose
+            Enable verbose output
+
+    -q, --quiet
+            Disable progress output
+
+    -y
+            Disable confirmation prompt.
+
+        --default-host <default-host>
+            Choose a default host triple
+
         --default-toolchain <default-toolchain>
             Choose a default toolchain to install. Use 'none' to not install any toolchains at all
 
-        --profile <profile>                         [default: default]  [possible values: minimal, default, complete]
-    -c, --component <components>...                Component name to also install
-    -t, --target <targets>...                      Target name to also install
+        --profile <profile>
+            [default: default] [possible values: minimal, default, complete]
+
+    -c, --component <components>...
+            Component name to also install
+
+    -t, --target <targets>...
+            Target name to also install
+
+        --no-update-default-toolchain
+            Don't update any existing default toolchain after install
+
+        --no-modify-path
+            Don't configure the PATH environment variable
+
+    -h, --help
+            Print help information
+
+    -V, --version
+            Print version information
 EOF
 }