Rename solana-netutil to solana-net-utils for consistency (#6895)

* sed -i -e 's/netutil/net_utils/g' $(git grep --files-with-matches netutil :**.rs)

* sed -i -e 's/netutil/net-utils/g' $(git grep --files-with-matches netutil)

* git mv netutil/ net-utils

* Tweak a bit

* Fix rustfmt & clippy
This commit is contained in:
Ryo Onodera
2019-11-13 05:37:13 +09:00
committed by Michael Vines
parent bb00904fc8
commit 3faeb7fa79
33 changed files with 78 additions and 74 deletions

View File

@ -32,7 +32,7 @@ solana-client = { path = "../client", version = "0.21.0" }
solana-config-api = { path = "../programs/config_api", version = "0.21.0" }
solana-drone = { path = "../drone", version = "0.21.0" }
solana-logger = { path = "../logger", version = "0.21.0" }
solana-netutil = { path = "../netutil", version = "0.21.0" }
solana-net-utils = { path = "../net-utils", version = "0.21.0" }
solana-runtime = { path = "../runtime", version = "0.21.0" }
solana-sdk = { path = "../sdk", version = "0.21.0" }
solana-stake-api = { path = "../programs/stake_api", version = "0.21.0" }

View File

@ -331,7 +331,7 @@ pub fn parse_command(matches: &ArgMatches<'_>) -> Result<CliCommandInfo, Box<dyn
})?;
let drone_host = if let Some(drone_host) = matches.value_of("drone_host") {
Some(solana_netutil::parse_host(drone_host).or_else(|err| {
Some(solana_net_utils::parse_host(drone_host).or_else(|err| {
Err(CliError::BadParameter(format!(
"Invalid drone host: {:?}",
err
@ -1058,7 +1058,7 @@ pub fn process_command(config: &CliConfig) -> ProcessResult {
.host()
.unwrap()
.to_string();
solana_netutil::parse_host(&drone_host).unwrap_or_else(|err| {
solana_net_utils::parse_host(&drone_host).unwrap_or_else(|err| {
panic!("Unable to resolve {}: {}", drone_host, err);
})
}),