Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ensure new lines after help message #20

Merged
merged 2 commits into from
Oct 31, 2015
Merged

Ensure new lines after help message #20

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b278040
ensure new line after help message
zonyitoo Oct 27, 2015
3f33baf
removed stablized fs_cannicalize feature
zonyitoo Oct 27, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rust-install/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#![feature(fs_canonicalize, fundamental)]
#![feature(fundamental)]

extern crate rand;
extern crate hyper;
Expand Down
35 changes: 23 additions & 12 deletions src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ not already installed then it is first installed.
If the toolchain is already installed then it is not reinstalled,
though if installing a custom toolchain with --copy-local,
--link-local, or --installer then the toolchain is always
reinstalled."
reinstalled.
"
)
.arg(Arg::with_name("toolchain").required(true))
.args(install_args())
Expand All @@ -42,7 +43,8 @@ though if installing a custom toolchain with --copy-local,
--link-local, or --installer then the toolchain is always
reinstalled.

To remove an existing override use `multirust remove-override`."
To remove an existing override use `multirust remove-override`.
"
)
.arg(Arg::with_name("toolchain").required(true))
.args(install_args())
Expand All @@ -54,7 +56,8 @@ To remove an existing override use `multirust remove-override`."
.after_help(
r"With no toolchain specified, the update command updates each of the
stable, beta, and nightly toolchains from the official release
channels, plus any other installed toolchains."
channels, plus any other installed toolchains.
"
)
.arg(Arg::with_name("toolchain").required(false))
.args(install_args())
Expand All @@ -81,15 +84,17 @@ channels, plus any other installed toolchains."
.about("Remove an override.")
.after_help(
r"Removes the override for the current directory, or the named
override if one is provided."
override if one is provided.
"
)
.arg(Arg::with_name("override").required(false))
)
.subcommand(
SubCommand::with_name("remove-toolchain")
.about("Uninstall a toolchain.")
.after_help(
r"Uninstalls an installed toolchain."
r"Uninstalls an installed toolchain.
"
)
.arg(Arg::with_name("toolchain").required(true))
)
Expand All @@ -101,7 +106,8 @@ r"Uninstalls an installed toolchain."
r"Configures an environment to use the given toolchain and then runs
the specified program. The command may be any program, not just
rustc or cargo. This can be used for testing arbitrary toolchains
without setting an override."
without setting an override.
"
)
.arg(Arg::with_name("toolchain").required(true))
.arg(Arg::with_name("command").required(true).multiple(true))
Expand All @@ -113,7 +119,8 @@ without setting an override."
.after_help(
r"Configures an environment to use the correct toolchain for the
current directory, and then runs the specified program. The command
may be any program, not just rustc or cargo."
may be any program, not just rustc or cargo.
"
)
.arg(Arg::with_name("command").required(true).multiple(true))
)
Expand All @@ -126,15 +133,17 @@ current user.

Prompts for confirmation, unless disabled.

Does not uninstall multirust."
Does not uninstall multirust.
"
)
.arg(Arg::with_name("no-prompt").short("y").help("Disable confirmation prompt."))
)
.subcommand(
SubCommand::with_name("upgrade-data")
.about("Upgrade the ~/.multirust directory.")
.after_help(
r"Upgrades the ~/.multirust directory from previous versions."
r"Upgrades the ~/.multirust directory from previous versions.
"
)
)
.subcommand(
Expand All @@ -144,7 +153,8 @@ r"Upgrades the ~/.multirust directory from previous versions."
SubCommand::with_name("install")
.about("Installs multirust.")
.after_help(
r"Installs multirust for the current user."
r"Installs multirust for the current user.
"
)
.arg(Arg::with_name("add-to-path").short("a").long("add-to-path").help("Modifies .profile or the registry"))
.arg(Arg::with_name("move").short("m").long("move").help("Move self instead of copying"))
Expand All @@ -166,7 +176,8 @@ r"Upgrades the ~/.multirust directory from previous versions."
r"Opens the documentation for the currently active toolchain with the
default browser.

By default, it opens the API documentation for the standard library."
By default, it opens the API documentation for the standard library.
"
)
.arg(Arg::with_name("all").long("all").help(r"
Opens the documentation overview page, which
Expand Down Expand Up @@ -226,7 +237,7 @@ fn install_args() -> Vec<Arg<'static, 'static, 'static, 'static, 'static, 'stati
local filesystem or the network. Custom
installers are neither checksum nor
signature-verified.

If multiple installers are specified then they
are all installed to the same location. This can
make installing cargo easier since otherwise it
Expand Down