Move version! from core:: to clap_utils:: (#6944)

* Move version! from core to clap-utils

* Completely move version! from core:: to clap_utils::

* rustfmt

* Do remaining transition after rebase
This commit is contained in:
Ryo Onodera
2019-11-14 13:10:38 +09:00
committed by GitHub
parent cc96848b01
commit 4fc767b3f6
36 changed files with 146 additions and 126 deletions

View File

@@ -1,4 +1,4 @@
use clap::{crate_description, crate_name, crate_version, App, Arg};
use clap::{crate_description, crate_name, App, Arg};
use console::style;
use solana_clap_utils::input_validators::is_keypair;
use solana_core::{
@@ -17,7 +17,7 @@ fn main() {
let matches = App::new(crate_name!())
.about(crate_description!())
.version(crate_version!())
.version(solana_clap_utils::version!())
.arg(
Arg::with_name("identity")
.short("i")
@@ -97,7 +97,7 @@ fn main() {
println!(
"{} version {} (branch={}, commit={})",
style(crate_name!()).bold(),
crate_version!(),
solana_clap_utils::version!(),
option_env!("CI_BRANCH").unwrap_or("unknown"),
option_env!("CI_COMMIT").unwrap_or("unknown")
);