Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Update SubstrateCli to return String #6550

Merged
cecton merged 10 commits into from
Jul 2, 2020
Merged

Update SubstrateCli to return String #6550

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c4f2a3a
Update SubstrateCli to return String
Jul 1, 2020
5d32d27
Merge branch 'master' of github.com:paritytech/substrate into scott_r…
Jul 1, 2020
75659b6
Add default implementation for executable_name()
Jul 1, 2020
e45b3d0
Use display instead of PathBuf
Jul 1, 2020
17883bf
Get file_name in default impl of executable_name
Jul 1, 2020
b7fd0b4
Remove String::from and use .into()
Jul 1, 2020
fef36b6
Use default impl for executable_name()
Jul 1, 2020
66a8c33
Use .as_str() and remove useless .to_string()
Jul 1, 2020
2d2c5ed
Update only sp-io when running companion build
cecton Jul 2, 2020
242c94f
Remove unneeded update of sp-io in CI
cecton Jul 2, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use .as_str() and remove useless .to_string()
  • Loading branch information
Scott Piriou committed Jul 1, 2020
commit 66a8c331a69f4e2f226ce0328aabe73cabc57451
16 changes: 8 additions & 8 deletions client/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,16 +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(&*name)
.author(&*author)
.about(&*about)
.name(name)
.author(author.as_str())
.about(about.as_str())
.version(full_version.as_str())
.settings(&[
AppSettings::GlobalVersion,
Expand Down Expand Up @@ -186,16 +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(&*name)
.author(&*author)
.about(&*about)
.name(name)
.author(author.as_str())
.about(about.as_str())
.version(full_version.as_str());

let matches = app.get_matches_from_safe(iter)?;
Expand Down