Skip to content

Commit

Permalink
Clippy.
Browse files Browse the repository at this point in the history
  • Loading branch information
frozenlib committed Feb 3, 2023
1 parent 4801d76 commit 776fcaa
Show file tree
Hide file tree
Showing 6 changed files with 20 additions and 23 deletions.
2 changes: 1 addition & 1 deletion parse-display-derive/src/format_syntax.rs
Expand Up @@ -433,6 +433,6 @@ mod tests {
}

fn assert_ps<'a>(s: &'a str, ps: FormatSpec<'a>) {
assert_eq!(FormatSpec::parse(s), Ok(ps), "input : {}", s);
assert_eq!(FormatSpec::parse(s), Ok(ps), "input : {s}");
}
}
22 changes: 11 additions & 11 deletions parse-display-derive/src/lib.rs
Expand Up @@ -338,7 +338,7 @@ impl<'a> ParserBuilder<'a> {
key.replace('.', "_")
};
let key = REGEX_NUMBER.replace(&key, "_$0");
format!("(?P<{}>", key)
format!("(?P<{key}>")
});
if let Err(e) = regex_syntax::ast::parse::Parser::new().parse(&text_debug) {
bail!(s.span(), "{}", e)
Expand All @@ -353,7 +353,7 @@ impl<'a> ParserBuilder<'a> {
if name == CAPTURE_NAME_EMPTY {
has_capture_empty = true;
}
Ok(format!("(?P<{}>", name))
Ok(format!("(?P<{name}>"))
})?;

if has_capture_empty {
Expand Down Expand Up @@ -398,7 +398,7 @@ impl<'a> ParserBuilder<'a> {
}
let c = self.set_capture(context, &keys, format.span)?;
self.parse_format
.push_hir(to_hir(&format!("(?P<{}>(?s:.*?))", c)));
.push_hir(to_hir(&format!("(?P<{c}>(?s:.*?))")));
}
}
}
Expand Down Expand Up @@ -1373,25 +1373,25 @@ impl FieldKey {
fn to_member(&self) -> Member {
match self {
FieldKey::Named(s) => Member::Named(format_ident!("r#{}", s)),
FieldKey::Unnamed(idx) => Member::Unnamed(parse_str(&format!("{}", idx)).unwrap()),
FieldKey::Unnamed(idx) => Member::Unnamed(parse_str(&format!("{idx}")).unwrap()),
}
}
fn binding_var(&self) -> Ident {
parse_str(&format!("_value_{}", self)).unwrap()
parse_str(&format!("_value_{self}")).unwrap()
}
fn new_arg_var(&self) -> Ident {
match self {
Self::Named(s) => parse_str(s),
Self::Unnamed(idx) => parse_str(&format!("_{}", idx)),
Self::Unnamed(idx) => parse_str(&format!("_{idx}")),
}
.unwrap()
}
}
impl std::fmt::Display for FieldKey {
fn fmt(&self, f: &mut std::fmt::Formatter) -> std::fmt::Result {
match self {
FieldKey::Named(s) => write!(f, "{}", s),
FieldKey::Unnamed(idx) => write!(f, "{}", idx),
FieldKey::Named(s) => write!(f, "{s}"),
FieldKey::Unnamed(idx) => write!(f, "{idx}"),
}
}
}
Expand Down Expand Up @@ -1419,7 +1419,7 @@ fn join<T: std::fmt::Display>(s: impl IntoIterator<Item = T>, sep: &str) -> Stri
let mut sep_current = "";
let mut buf = String::new();
for i in s.into_iter() {
write!(&mut buf, "{}{}", sep_current, i).unwrap();
write!(&mut buf, "{sep_current}{i}").unwrap();
sep_current = sep;
}
buf
Expand All @@ -1446,11 +1446,11 @@ fn field_of<'a, 'b>(

const CAPTURE_NAME_EMPTY: &str = "empty";
fn capture_name(idx: usize) -> String {
format!("value_{}", idx)
format!("value_{idx}")
}

fn build_parse_capture_expr(field_name: &str, capture_name: &str) -> TokenStream {
let msg = format!("field `{}` parse failed.", field_name);
let msg = format!("field `{field_name}` parse failed.");
quote! {
c.name(#capture_name)
.map_or("", |m| m.as_str())
Expand Down
2 changes: 1 addition & 1 deletion parse-display-derive/src/syn_utils.rs
Expand Up @@ -171,7 +171,7 @@ pub fn impl_trait_result(
) -> Result<TokenStream> {
let ts = impl_trait(input, trait_path, wheres, contents);
if dump {
panic!("macro output:\n{}", ts);
panic!("macro output:\n{ts}");
}
Ok(ts)
}
6 changes: 3 additions & 3 deletions parse-display-tests/tests/both.rs
Expand Up @@ -26,11 +26,11 @@ fn assert_both<T: Display + FromStr + PartialEq + Debug>(s: &str, value: T)
where
<T as FromStr>::Err: Display,
{
let value_display = format!("{}", value);
let value_display = format!("{value}");
assert_eq!(value_display, s);

match s.parse::<T>() {
Ok(a) => assert_eq!(a, value, "input = \"{}\"", s),
Err(e) => panic!("\"{}\" parse failed. ({})", s, e),
Ok(a) => assert_eq!(a, value, "input = \"{s}\""),
Err(e) => panic!("\"{s}\" parse failed. ({e})"),
}
}
2 changes: 1 addition & 1 deletion parse-display-tests/tests/display.rs
Expand Up @@ -972,6 +972,6 @@ fn format_spec_is_empty() {
}

fn assert_display<T: core::fmt::Display>(value: T, display: &str) {
let value_display = alloc::format!("{}", value);
let value_display = alloc::format!("{value}");
assert_eq!(value_display, display);
}
9 changes: 3 additions & 6 deletions parse-display-tests/tests/from_str.rs
Expand Up @@ -1078,15 +1078,12 @@ where
<T as FromStr>::Err: Display,
{
match s.parse::<T>() {
Ok(a) => assert_eq!(a, value, "input = \"{}\"", s),
Err(e) => panic!("\"{}\" parse failed. ({})", s, e),
Ok(a) => assert_eq!(a, value, "input = \"{s}\""),
Err(e) => panic!("\"{s}\" parse failed. ({e})"),
}
}
fn assert_from_str_err<T: FromStr + Debug>(s: &str) {
if let Ok(a) = s.parse::<T>() {
panic!(
"from_str(\"{}\") should return Err. but return `{:?}`.",
s, a
);
panic!("from_str(\"{s}\") should return Err. but return `{a:?}`.");
}
}

0 comments on commit 776fcaa

Please sign in to comment.