Skip to content

Commit dcdd3e4

Browse files
committed
Replace structopt with clap and remove commit hash from version string
1 parent b718904 commit dcdd3e4

File tree

5 files changed

+7
-127
lines changed

5 files changed

+7
-127
lines changed

Diff for: Cargo.lock

+1-108
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tag-name = "{{version}}"
2020
itertools = "0.8"
2121
log = "0.4"
2222
log4rs = "0"
23-
structopt = "0"
23+
clap = { version = "2", default-features = false }
2424
maplit = "1"
2525
serde = "1"
2626
serde_derive = "1"

Diff for: build.rs

-9
This file was deleted.

Diff for: src/logger.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,8 @@ fn create_config(path: &Option<PathBuf>, level: LevelFilter) -> Result<Config> {
8080
#[allow(clippy::write_literal)]
8181
writeln!(
8282
f,
83-
"#######\nLanguageClient {} {}\n#######",
83+
"#######\nLanguageClient {}\n#######",
8484
env!("CARGO_PKG_VERSION"),
85-
env!("GIT_HASH")
8685
)?;
8786
}
8887

Diff for: src/main.rs

+4-7
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,17 @@ mod vimext;
1414
use anyhow::Result;
1515
use std::collections::HashMap;
1616
use std::sync::{Arc, Mutex};
17-
use structopt::StructOpt;
1817
use types::State;
1918

20-
#[derive(Debug, StructOpt)]
21-
struct Arguments {}
19+
#[macro_use]
20+
extern crate clap;
2221

2322
fn main() -> Result<()> {
24-
let version = format!("{} {}", env!("CARGO_PKG_VERSION"), env!("GIT_HASH"));
25-
let args = Arguments::clap().version(version.as_str());
26-
let _ = args.get_matches();
23+
let _ = clap::app_from_crate!().get_matches();
2724

2825
let (tx, rx) = crossbeam::channel::unbounded();
2926
let language_client = language_client::LanguageClient {
30-
version,
27+
version: env!("CARGO_PKG_VERSION").into(),
3128
state_mutex: Arc::new(Mutex::new(State::new(tx)?)),
3229
clients_mutex: Arc::new(Mutex::new(HashMap::new())),
3330
};

0 commit comments

Comments
 (0)