Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Commit 1f41d37

Browse files
mvinesmvines
committed
Remove solana_clap_utils::version! macro
1 parent 193fcf3 commit 1f41d37

File tree

43 files changed

+63
-52
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+63
-52
lines changed

‎Cargo.lock

Lines changed: 19 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎archiver/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ solana-metrics = { path = "../metrics", version = "1.2.0" }
1717
solana-archiver-lib = { path = "../archiver-lib", version = "1.2.0" }
1818
solana-net-utils = { path = "../net-utils", version = "1.2.0" }
1919
solana-sdk = { path = "../sdk", version = "1.2.0" }
20-
20+
solana-version = { path = "../version", version = "1.2.0" }
2121

2222
[package.metadata.docs.rs]
2323
targets = ["x86_64-unknown-linux-gnu"]

‎archiver/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fn main() {
2424

2525
let matches = App::new(crate_name!())
2626
.about(crate_description!())
27-
.version(solana_clap_utils::version!())
27+
.version(solana_version::version!())
2828
.arg(
2929
Arg::with_name("identity_keypair")
3030
.short("i")
@@ -105,7 +105,7 @@ fn main() {
105105
println!(
106106
"{} version {} (branch={}, commit={})",
107107
style(crate_name!()).bold(),
108-
solana_clap_utils::version!(),
108+
solana_version::version!(),
109109
option_env!("CI_BRANCH").unwrap_or("unknown"),
110110
option_env!("CI_COMMIT").unwrap_or("unknown")
111111
);

‎bench-exchange/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ solana-metrics = { path = "../metrics", version = "1.2.0" }
2929
solana-net-utils = { path = "../net-utils", version = "1.2.0" }
3030
solana-runtime = { path = "../runtime", version = "1.2.0" }
3131
solana-sdk = { path = "../sdk", version = "1.2.0" }
32+
solana-version = { path = "../version", version = "1.2.0" }
3233

3334
[dev-dependencies]
3435
solana-local-cluster = { path = "../local-cluster", version = "1.2.0" }

‎bench-exchange/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ fn main() {
1111
solana_logger::setup();
1212
solana_metrics::set_panic_hook("bench-exchange");
1313

14-
let matches = cli::build_args(solana_clap_utils::version!()).get_matches();
14+
let matches = cli::build_args(solana_version::version!()).get_matches();
1515
let cli_config = cli::extract_args(&matches);
1616

1717
let cli::Config {

‎bench-streamer/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ solana-clap-utils = { path = "../clap-utils", version = "1.2.0" }
1313
solana-streamer = { path = "../streamer", version = "1.2.0" }
1414
solana-logger = { path = "../logger", version = "1.2.0" }
1515
solana-net-utils = { path = "../net-utils", version = "1.2.0" }
16+
solana-version = { path = "../version", version = "1.2.0" }
1617

1718
[package.metadata.docs.rs]
1819
targets = ["x86_64-unknown-linux-gnu"]

‎bench-streamer/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ fn main() -> Result<()> {
5252

5353
let matches = App::new(crate_name!())
5454
.about(crate_description!())
55-
.version(solana_clap_utils::version!())
55+
.version(solana_version::version!())
5656
.arg(
5757
Arg::with_name("num-recv-sockets")
5858
.long("num-recv-sockets")

‎bench-tps/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ solana-net-utils = { path = "../net-utils", version = "1.2.0" }
2727
solana-runtime = { path = "../runtime", version = "1.2.0" }
2828
solana-sdk = { path = "../sdk", version = "1.2.0" }
2929
solana-move-loader-program = { path = "../programs/move_loader", version = "1.2.0", optional = true }
30+
solana-version = { path = "../version", version = "1.2.0" }
3031

3132
[dev-dependencies]
3233
serial_test = "0.4.0"

‎bench-tps/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn main() {
1515
solana_logger::setup_with_default("solana=info");
1616
solana_metrics::set_panic_hook("bench-tps");
1717

18-
let matches = cli::build_args(solana_clap_utils::version!()).get_matches();
18+
let matches = cli::build_args(solana_version::version!()).get_matches();
1919
let cli_config = cli::extract_args(&matches);
2020

2121
let cli::Config {

‎clap-utils/src/lib.rs

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,5 @@
11
use thiserror::Error;
22

3-
#[macro_export]
4-
macro_rules! version {
5-
() => {
6-
&*format!(
7-
"{}{}",
8-
env!("CARGO_PKG_VERSION"),
9-
if option_env!("CI_TAG").unwrap_or("").is_empty() {
10-
format!(
11-
" [channel={} commit={}]",
12-
option_env!("CHANNEL").unwrap_or("unknown"),
13-
option_env!("CI_COMMIT").unwrap_or("unknown"),
14-
)
15-
} else {
16-
"".to_string()
17-
},
18-
)
19-
};
20-
}
21-
223
pub struct ArgConstant<'a> {
234
pub long: &'a str,
245
pub name: &'a str,

‎cli/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ solana-sdk = { path = "../sdk", version = "1.2.0" }
4141
solana-stake-program = { path = "../programs/stake", version = "1.2.0" }
4242
solana-storage-program = { path = "../programs/storage", version = "1.2.0" }
4343
solana-transaction-status = { path = "../transaction-status", version = "1.2.0" }
44+
solana-version = { path = "../version", version = "1.2.0" }
4445
solana-vote-program = { path = "../programs/vote", version = "1.2.0" }
4546
solana-vote-signer = { path = "../vote-signer", version = "1.2.0" }
4647
thiserror = "1.0.15"

‎cli/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
156156
let matches = app(
157157
crate_name!(),
158158
crate_description!(),
159-
solana_clap_utils::version!(),
159+
solana_version::version!(),
160160
)
161161
.arg({
162162
let arg = Arg::with_name("config_file")

‎core/src/rpc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2608,7 +2608,7 @@ pub mod tests {
26082608
let expected = json!({
26092609
"jsonrpc": "2.0",
26102610
"result": {
2611-
"solana-core": solana_clap_utils::version!().to_string()
2611+
"solana-core": solana_version::version!().to_string()
26122612
},
26132613
"id": 1
26142614
});

‎core/tests/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fn test_rpc_client() {
4646

4747
assert_eq!(
4848
client.get_version().unwrap().solana_core,
49-
solana_clap_utils::version!()
49+
solana_version::version!()
5050
);
5151

5252
assert!(client.get_account(&bob_pubkey).is_err());

‎dos/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ solana-logger = { path = "../logger", version = "1.2.0" }
1919
solana-net-utils = { path = "../net-utils", version = "1.2.0" }
2020
solana-runtime = { path = "../runtime", version = "1.2.0" }
2121
solana-sdk = { path = "../sdk", version = "1.2.0" }
22+
solana-version = { path = "../version", version = "1.2.0" }
2223

2324
[package.metadata.docs.rs]
2425
targets = ["x86_64-unknown-linux-gnu"]

‎dos/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ fn main() {
9494
solana_logger::setup_with_default("solana=info");
9595
let matches = App::new(crate_name!())
9696
.about(crate_description!())
97-
.version(solana_clap_utils::version!())
97+
.version(solana_version::version!())
9898
.arg(
9999
Arg::with_name("entrypoint")
100100
.long("entrypoint")

‎faucet/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@ license = "Apache-2.0"
88
homepage = "https://solana.com/"
99
edition = "2018"
1010

11-
12-
13-
1411
[dependencies]
1512
bincode = "1.2.1"
1613
byteorder = "1.3.4"
@@ -23,6 +20,7 @@ solana-clap-utils = { path = "../clap-utils", version = "1.2.0" }
2320
solana-logger = { path = "../logger", version = "1.2.0" }
2421
solana-metrics = { path = "../metrics", version = "1.2.0" }
2522
solana-sdk = { path = "../sdk", version = "1.2.0" }
23+
solana-version = { path = "../version", version = "1.2.0" }
2624
tokio = "0.1"
2725
tokio-codec = "0.1"
2826

‎faucet/src/bin/faucet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
1616
solana_metrics::set_panic_hook("faucet");
1717
let matches = App::new(crate_name!())
1818
.about(crate_description!())
19-
.version(solana_clap_utils::version!())
19+
.version(solana_version::version!())
2020
.arg(
2121
Arg::with_name("keypair")
2222
.short("k")

‎genesis/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ solana-sdk = { path = "../sdk", version = "1.2.0" }
2323
solana-stake-program = { path = "../programs/stake", version = "1.2.0" }
2424
solana-storage-program = { path = "../programs/storage", version = "1.2.0" }
2525
solana-vote-program = { path = "../programs/vote", version = "1.2.0" }
26+
solana-version = { path = "../version", version = "1.2.0" }
2627
tempfile = "3.1.0"
2728

2829
[[bin]]
2930
name = "solana-genesis"
3031
path = "src/main.rs"
3132

32-
3333
[lib]
3434
name = "solana_genesis"
3535

‎genesis/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
128128

129129
let matches = App::new(crate_name!())
130130
.about(crate_description!())
131-
.version(solana_clap_utils::version!())
131+
.version(solana_version::version!())
132132
.arg(
133133
Arg::with_name("creation_time")
134134
.long("creation-time")

‎gossip/Cargo.toml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,7 @@ solana-client = { path = "../client", version = "1.2.0" }
1616
solana-logger = { path = "../logger", version = "1.2.0" }
1717
solana-net-utils = { path = "../net-utils", version = "1.2.0" }
1818
solana-sdk = { path = "../sdk", version = "1.2.0" }
19-
20-
21-
19+
solana-version = { path = "../version", version = "1.2.0" }
2220

2321
[package.metadata.docs.rs]
2422
targets = ["x86_64-unknown-linux-gnu"]

‎gossip/src/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ fn main() -> Result<(), Box<dyn error::Error>> {
1717

1818
let matches = App::new(crate_name!())
1919
.about(crate_description!())
20-
.version(solana_clap_utils::version!())
20+
.version(solana_version::version!())
2121
.setting(AppSettings::SubcommandRequiredElseHelp)
2222
.subcommand(
2323
SubCommand::with_name("rpc-url")

‎install/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ solana-client = { path = "../client", version = "1.2.0" }
2929
solana-config-program = { path = "../programs/config", version = "1.2.0" }
3030
solana-logger = { path = "../logger", version = "1.2.0" }
3131
solana-sdk = { path = "../sdk", version = "1.2.0" }
32+
solana-version = { path = "../version", version = "1.2.0" }
3233
semver = "0.9.0"
3334
tar = "0.4.26"
3435
tempdir = "0.3.7"

0 commit comments

Comments
 (0)