pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 17:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update SubstrateCli to return String (#6550)

Browse Source 
* Update SubstrateCli to return String

* Add default implementation for executable_name()

* Use display instead of PathBuf

* Get file_name in default impl of executable_name

* Remove String::from and use .into()

* Use default impl for executable_name()

* Use .as_str() and remove useless .to_string()

* Update only sp-io when running companion build

* Remove unneeded update of sp-io in CI

Co-authored-by: Cecile Tonglet <cecile@parity.io>
This commit is contained in:
pscott
2020-07-02 13:34:56 +02:00
committed by GitHub
parent 7b0028d75a
commit 540ae1c161
10 changed files with 65 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/cli/src/config.rs
+2 -2
View File
@@ -413,7 +413,7 @@ pub trait CliConfiguration: Sized {
let chain_spec = cli.load_spec(chain_id.as_str())?;
let base_path = self
.base_path()?
.unwrap_or_else(|| BasePath::from_project("", "", C::executable_name()));
.unwrap_or_else(|| BasePath::from_project("", "", &C::executable_name()));
let config_dir = base_path
.path()
.to_path_buf()
@@ -498,7 +498,7 @@ pub trait CliConfiguration: Sized {
fn init<C: SubstrateCli>(&self) -> Result<()> {
let logger_pattern = self.log_filters()?;
sp_panic_handler::set(C::support_url(), C::impl_version());
sp_panic_handler::set(&C::support_url(), &C::impl_version());
fdlimit::raise_fd_limit();
init_logger(&logger_pattern);
substrate/client/cli/src/lib.rs
+28 -14
View File
@@ -57,25 +57,33 @@ use structopt::{
/// its own implementation that will fill the necessary field based on the trait's functions.
pub trait SubstrateCli: Sized {
/// Implementation name.
fn impl_name() -> &'static str;
fn impl_name() -> String;
/// Implementation version.
///
/// By default this will look like this: 2.0.0-b950f731c-x86_64-linux-gnu where the hash is the
/// short commit hash of the commit of in the Git repository.
fn impl_version() -> &'static str;
fn impl_version() -> String;
/// Executable file name.
fn executable_name() -> &'static str;
///
/// Extracts the file name from `std::env::current_exe()`.
/// Resorts to the env var `CARGO_PKG_NAME` in case of Error.
fn executable_name() -> String {
std::env::current_exe().ok()
.and_then(|e| e.file_name().map(|s| s.to_os_string()))
.and_then(|w| w.into_string().ok())
.unwrap_or_else(|| env!("CARGO_PKG_NAME").into())
}
/// Executable file description.
fn description() -> &'static str;
fn description() -> String;
/// Executable file author.
fn author() -> &'static str;
fn author() -> String;
/// Support URL.
fn support_url() -> &'static str;
fn support_url() -> String;
/// Copyright starting year (x-current year)
fn copyright_start_year() -> i32;
@@ -116,13 +124,16 @@ pub trait SubstrateCli: Sized {
{
let app = <Self as StructOpt>::clap();
let mut full_version = Self::impl_version().to_string();
let mut full_version = Self::impl_version();
full_version.push_str("\n");
let name = Self::executable_name();
let author = Self::author();
let about = Self::description();
let app = app
.name(Self::executable_name())
.author(Self::author())
.about(Self::description())
.name(name)
.author(author.as_str())
.about(about.as_str())
.version(full_version.as_str())
.settings(&[
AppSettings::GlobalVersion,
@@ -175,13 +186,16 @@ pub trait SubstrateCli: Sized {
{
let app = <Self as StructOpt>::clap();
let mut full_version = Self::impl_version().to_string();
let mut full_version = Self::impl_version();
full_version.push_str("\n");
let name = Self::executable_name();
let author = Self::author();
let about = Self::description();
let app = app
.name(Self::executable_name())
.author(Self::author())
.about(Self::description())
.name(name)
.author(author.as_str())
.about(about.as_str())
.version(full_version.as_str());
let matches = app.get_matches_from_safe(iter)?;