wez/wezterm
1
1
Fork 0
mirror of https://github.com/wez/wezterm.git synced 2024-09-20 11:17:15 +03:00
Code Issues Projects Releases Wiki Activity

avoid use of a fork of structopt just for vergen compat

Browse Source 
This is much simpler!
Clean up some of the attributes while I'm in here.

refs: https://github.com/TeXitoi/structopt/issues/209
This commit is contained in:
Wez Furlong 2019-06-27 07:21:59 -07:00
parent 2ad7f7084d
commit 51ead397f6
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Cargo.toml
View File

@ -41,7 +41,7 @@ ratelimit_meter = "4.1"
rayon = "1.0"
serde = {version="1.0", features = ["rc"]}
serde_derive = "1.0"
structopt = "0.2.17"
structopt = "0.2"
tabout = { path = "tabout" }
term = { path = "term" }
termwiz = { path = "termwiz"}
@ -100,10 +100,6 @@ core-text = "13.2"
force-glutin = []
force-fontconfig = ["fontconfig"]
[patch.crates-io]
# This allows using the git version in the help output
structopt-derive = { git = "https://github.com/wez/structopt", branch="vergen" }
[workspace]
[profile.release]

8
src/main.rs
View File

@ -62,7 +62,10 @@ fn get_shell() -> Result<String, Error> {
#[derive(Debug, StructOpt)]
#[structopt(about = "Wez's Terminal Emulator\nhttp://github.com/wez/wezterm")]
#[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
#[structopt(raw(
global_setting = "structopt::clap::AppSettings::ColoredHelp",
version = r#"env!("VERGEN_SEMVER_LIGHTWEIGHT")"#,
))]
struct Opt {
/// Skip loading ~/.wezterm.toml
#[structopt(short = "n")]
@ -111,11 +114,9 @@ struct StartCommand {
#[derive(Debug, StructOpt, Clone)]
enum SubCommand {
#[structopt(name = "start", about = "Start a front-end")]
#[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
Start(StartCommand),
#[structopt(name = "cli", about = "Interact with experimental mux server")]
#[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
Cli(CliCommand),
}
@ -128,7 +129,6 @@ struct CliCommand {
#[derive(Debug, StructOpt, Clone)]
enum CliSubCommand {
#[structopt(name = "list", about = "list windows and tabs")]
#[structopt(raw(setting = "structopt::clap::AppSettings::ColoredHelp"))]
List,
}