gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files

6
install/src/lib.rs
View File

@ -1,7 +1,7 @@
#[macro_use]
extern crate lazy_static;
use clap::{crate_description, crate_name, crate_version, App, AppSettings, Arg, SubCommand};
use clap::{crate_description, crate_name, App, AppSettings, Arg, SubCommand};
use solana_clap_utils::input_validators::{is_pubkey, is_release_channel, is_semver, is_url};
use solana_sdk::pubkey::Pubkey;
@ -17,7 +17,7 @@ pub fn main() -> Result<(), String> {
let matches = App::new(crate_name!())
.about(crate_description!())
.version(crate_version!())
.version(solana_clap_utils::version!())
.setting(AppSettings::SubcommandRequiredElseHelp)
.arg({
let arg = Arg::with_name("config_file")
@ -234,7 +234,7 @@ pub fn main_init() -> Result<(), String> {
let matches = App::new("solana-install-init")
.about("initializes a new installation")
.version(crate_version!())
.version(solana_clap_utils::version!())
.arg({
let arg = Arg::with_name("config_file")
.short("c")