grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove redundant macro println_stderr from parity/cli/usage.rs (#10425)

Browse Source
This commit is contained in:
Marek Kotewicz 2019-02-27 10:07:41 +01:00 committed by GitHub
parent c7ded6a785
commit fefec000fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
parity/cli/usage.rs
View File

@ -14,13 +14,6 @@
// You should have received a copy of the GNU General Public License // You should have received a copy of the GNU General Public License
// along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>. // along with Parity Ethereum. If not, see <http://www.gnu.org/licenses/>.
macro_rules! println_stderr(
($($arg:tt)*) => { {
let r = writeln!(&mut ::std::io::stderr(), $($arg)*);
r.expect("failed printing to stderr");
} }
);
macro_rules! return_if_parse_error { macro_rules! return_if_parse_error {
($e:expr) => ( ($e:expr) => (
match $e { match $e {
@ -143,7 +136,7 @@ macro_rules! usage {
) => { ) => {
use toml; use toml;
use std::{fs, io, process, cmp}; use std::{fs, io, process, cmp};
use std::io::{Read, Write}; use std::io::Read;
use parity_version::version; use parity_version::version;
use clap::{Arg, App, SubCommand, AppSettings, ArgSettings, Error as ClapError, ErrorKind as ClapErrorKind}; use clap::{Arg, App, SubCommand, AppSettings, ArgSettings, Error as ClapError, ErrorKind as ClapErrorKind};
use dir::helpers::replace_home; use dir::helpers::replace_home;
@ -172,17 +165,17 @@ macro_rules! usage {
match self { match self {
ArgsError::Clap(e) => e.exit(), ArgsError::Clap(e) => e.exit(),
ArgsError::Decode(e) => { ArgsError::Decode(e) => {
println_stderr!("You might have supplied invalid parameters in config file."); eprintln!("You might have supplied invalid parameters in config file.");
println_stderr!("{}", e); eprintln!("{}", e);
process::exit(2) process::exit(2)
}, },
ArgsError::Config(path, e) => { ArgsError::Config(path, e) => {
println_stderr!("There was an error reading your config file at: {}", path); eprintln!("There was an error reading your config file at: {}", path);
println_stderr!("{}", e); eprintln!("{}", e);
process::exit(2) process::exit(2)
}, },
ArgsError::PeerConfiguration => { ArgsError::PeerConfiguration => {
println_stderr!("You have supplied `min_peers` > `max_peers`"); eprintln!("You have supplied `min_peers` > `max_peers`");
process::exit(2) process::exit(2)
} }
} }
@ -332,7 +325,7 @@ macro_rules! usage {
let args = match (fs::File::open(&config_file), raw_args.arg_config.clone()) { let args = match (fs::File::open(&config_file), raw_args.arg_config.clone()) {
// Load config file // Load config file
(Ok(mut file), _) => { (Ok(mut file), _) => {
println_stderr!("Loading config file from {}", &config_file); eprintln!("Loading config file from {}", &config_file);
let mut config = String::new(); let mut config = String::new();
file.read_to_string(&mut config).map_err(|e| ArgsError::Config(config_file, e))?; file.read_to_string(&mut config).map_err(|e| ArgsError::Config(config_file, e))?;
Ok(raw_args.into_args(Self::parse_config(&config)?)) Ok(raw_args.into_args(Self::parse_config(&config)?))