Skip to content

Commit

Permalink
clean cargo check alert
Browse files Browse the repository at this point in the history
  • Loading branch information
ogata-k committed Dec 5, 2022
1 parent 9505cab commit 6dddcb3
Show file tree
Hide file tree
Showing 5 changed files with 41 additions and 33 deletions.
4 changes: 2 additions & 2 deletions src/cli/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ impl<'a, 'b> FakerApp<'a, 'b> {
return Ok(());
}
if !m.is_present("option") {
app.print_help();
app.print_help().unwrap();
return Ok(());
}

Expand Down Expand Up @@ -144,7 +144,7 @@ impl<'a, 'b> FakerApp<'a, 'b> {
}

let mut faker = Faker::new(thread_rng(), locale);
let mut writer = std::io::stdout();
let mut writer = io::stdout();
if size == 1 {
if m.is_present("fullform") {
to_record_with_header(&mut writer, &mut faker, converter, &header_options)
Expand Down
63 changes: 35 additions & 28 deletions src/cli/scanner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1088,30 +1088,37 @@ pub enum ScannerError {
UnknownCharacters(Vec<String>),
UnknownStringFormat(Vec<String>),
UnknownBooleanFormat(Vec<String>),
#[allow(dead_code)]
UnknownStringListFormat(Vec<String>),
UnknownIntegerListFormat(Vec<String>),
RangeErr(String, String),
UnknownJoinItemFormat(String),
}

impl ScannerError {
fn write_messages(f: &mut Formatter<'_>, title: &str, options: &[(&str, &str)]) {
write!(f, "{}:", title);
fn write_messages(
f: &mut Formatter<'_>,
title: &str,
options: &[(&str, &str)],
) -> Result<(), Error> {
write!(f, "{}:", title)?;
for option in options {
write!(f, "\n\t{} := {}", option.0, option.1);
write!(f, "\n\t{} := {}", option.0, option.1)?;
}

Ok(())
}

fn write_unknown_format(f: &mut Formatter<'_>, target: &str) {
writeln!(f, "Unknown format is \"{}\"", target);
fn write_unknown_format(f: &mut Formatter<'_>, target: &str) -> Result<(), Error> {
writeln!(f, "Unknown format is \"{}\"", target)
}

fn write_unknown_format_of_vec(f: &mut Formatter<'_>, subs: &[String]) {
writeln!(f, "Unknown format is {}", vec_to_str(subs));
fn write_unknown_format_of_vec(f: &mut Formatter<'_>, subs: &[String]) -> Result<(), Error> {
writeln!(f, "Unknown format is {}", vec_to_str(subs))
}

pub fn write_option_format(f: &mut Formatter<'_>) {
Self::write_messages(f, "Usable Option format", &Scanner::all_format_pair());
pub fn write_option_format(f: &mut Formatter<'_>) -> Result<(), Error> {
Self::write_messages(f, "Usable Option format", &Scanner::all_format_pair())
}
}

Expand All @@ -1120,7 +1127,7 @@ impl Display for ScannerError {
use ScannerError::*;
match self {
UnknownCategory(s) => {
writeln!(f, "Unknown Category is {}", s);
writeln!(f, "Unknown Category is {}", s)?;
write!(
f,
"Usable Category is {}",
Expand All @@ -1130,55 +1137,55 @@ impl Display for ScannerError {
.map(|c| c.to_string())
.collect::<Vec<String>>()
)
);
)?;
Ok(())
}
UnknownOptionFormat(s) => {
Self::write_unknown_format(f, s);
Self::write_option_format(f);
Self::write_unknown_format(f, s)?;
Self::write_option_format(f)?;
Ok(())
}
UnknownOption(s, c) => {
writeln!(f, "Unknown Option is \"{}\"", s);
writeln!(f, "Unknown Option is \"{}\"", s)?;
writeln!(
f,
"Usable Option's format is ({}) | ({})",
Scanner::NORMAL_OPTION_FORMAT,
Scanner::WITH_JOIN_OPTION_FORMAT
);
)?;
write!(
f,
"And usable Option is {}",
vec_to_str(&Scanner::readable_options(*c))
);
)?;
Ok(())
}
UnknownCharacters(s_list) => {
// because of s_list is characters of splitting # before.
write!(f, "Unknown characters \"{}\"", s_list.join("#"));
write!(f, "Unknown characters \"{}\"", s_list.join("#"))?;
Ok(())
}
UnknownStringFormat(s_list) => {
Self::write_unknown_format_of_vec(f, s_list);
Self::write_messages(f, "Usable String format", &[Scanner::STRING]);
Self::write_unknown_format_of_vec(f, s_list)?;
Self::write_messages(f, "Usable String format", &[Scanner::STRING])?;
Ok(())
}
UnknownBooleanFormat(s_list) => {
Self::write_unknown_format_of_vec(f, s_list);
Self::write_messages(f, "Usable Boolean format", &[Scanner::BOOL]);
Self::write_unknown_format_of_vec(f, s_list)?;
Self::write_messages(f, "Usable Boolean format", &[Scanner::BOOL])?;
Ok(())
}
UnknownStringListFormat(s_list) => {
Self::write_unknown_format_of_vec(f, s_list);
Self::write_unknown_format_of_vec(f, s_list)?;
Self::write_messages(
f,
"Usable String list format",
&[Scanner::STRING_LIST, Scanner::STRING],
);
)?;
Ok(())
}
UnknownIntegerListFormat(s_list) => {
Self::write_unknown_format_of_vec(f, s_list);
Self::write_unknown_format_of_vec(f, s_list)?;
Self::write_messages(
f,
"Usable Integer list format",
Expand All @@ -1187,15 +1194,15 @@ impl Display for ScannerError {
Scanner::SIGNED_MIN_MAX,
Scanner::UNSIGNED_INT,
],
);
)?;
Ok(())
}
RangeErr(from, to) => {
write!(f, "Range Err: {} is not larger than {}", from, to);
write!(f, "Range Err: {} is not larger than {}", from, to)?;
Ok(())
}
UnknownJoinItemFormat(s) => {
writeln!(f, "Unknown join item option format \"{}\"", s);
writeln!(f, "Unknown join item option format \"{}\"", s)?;
Self::write_messages(
f,
"Usable repeatable option format for join item option",
Expand All @@ -1204,7 +1211,7 @@ impl Display for ScannerError {
Scanner::JOIN_SEPARATOR,
Scanner::REPEAT_OPTION,
],
);
)?;
Ok(())
}
}
Expand Down
1 change: 1 addition & 0 deletions src/converter/file_convert.rs
Original file line number Diff line number Diff line change
Expand Up @@ -318,6 +318,7 @@ impl Converter for JsonConverter {
unreachable!()
}

#[allow(unused_variables)]
fn to_header<W: io::Write>(&self, w: &mut W) -> io::Result<()> {
unreachable!()
}
Expand Down
2 changes: 1 addition & 1 deletion src/helper.rs
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
use rand::distributions::uniform::{SampleUniform, SampleRange};
use rand::distributions::uniform::{SampleRange, SampleUniform};
use rand::seq::SliceRandom;
use rand::Rng;
use std::fmt::Display;
Expand Down
4 changes: 2 additions & 2 deletions src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ use crate::cli::FakerApp;
mod cli;

// as cli
fn main() {
FakerApp::new().run();
fn main() -> std::io::Result<()> {
FakerApp::new().run()
}

0 comments on commit 6dddcb3

Please sign in to comment.