mirror of
https://github.com/rust-lang/rust.git
synced 2026-05-07 09:13:07 +03:00
Adjusting help message (#4865)
On stable, running with `--help|-h` shows information about `file-lines` which is a nightly-only option. This commit removes all mention of `file-lines` from the help message on stable. There is room for improvement here; perhaps a new struct called, e.g., `StableOptions` could be added to complement the existing `GetOptsOptions` struct. `StableOptions` could have a field for each field in `GetOptsOptions`, with each field's value being a `bool` that specifies whether or not the option exists on stable. Or is this adding too much complexity?
This commit is contained in:
committed by
Caleb Cartwright
parent
1ca3798d2c
commit
486e774fbf
+10
-7
@@ -178,12 +178,15 @@ fn make_opts() -> Options {
|
||||
opts.optflag("v", "verbose", "Print verbose output");
|
||||
opts.optflag("q", "quiet", "Print less output");
|
||||
opts.optflag("V", "version", "Show version information");
|
||||
opts.optflagopt(
|
||||
"h",
|
||||
"help",
|
||||
"Show this message or help about a specific topic: `config` or `file-lines`",
|
||||
"=TOPIC",
|
||||
);
|
||||
let help_topics = if is_nightly {
|
||||
"`config` or `file-lines`"
|
||||
} else {
|
||||
"`config`"
|
||||
};
|
||||
let mut help_topic_msg = "Show this message or help about a specific topic: ".to_owned();
|
||||
help_topic_msg.push_str(help_topics);
|
||||
|
||||
opts.optflagopt("h", "help", &help_topic_msg, "=TOPIC");
|
||||
|
||||
opts
|
||||
}
|
||||
@@ -437,7 +440,7 @@ fn determine_operation(matches: &Matches) -> Result<Operation, OperationError> {
|
||||
return Ok(Operation::Help(HelpOp::None));
|
||||
} else if topic == Some("config".to_owned()) {
|
||||
return Ok(Operation::Help(HelpOp::Config));
|
||||
} else if topic == Some("file-lines".to_owned()) {
|
||||
} else if topic == Some("file-lines".to_owned()) && is_nightly() {
|
||||
return Ok(Operation::Help(HelpOp::FileLines));
|
||||
} else {
|
||||
return Err(OperationError::UnknownHelpTopic(topic.unwrap()));
|
||||
|
||||
Reference in New Issue
Block a user