Skip to content

Commit 0ad81fa

Browse files
authored
fixes for nightly clippy (#537)
1 parent ec593b4 commit 0ad81fa

File tree

3 files changed

+11
-16
lines changed

3 files changed

+11
-16
lines changed

asn1_derive/src/lib.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@ fn generate_read_element(
657657
) -> syn::Result<proc_macro2::TokenStream> {
658658
let (read_type, default) = extract_field_properties(&f.attrs)?;
659659

660-
let error_location = format!("{}::{}", struct_name, f_name);
660+
let error_location = format!("{struct_name}::{f_name}");
661661
let add_error_location = quote::quote! {
662662
.map_err(|e| e.add_location(asn1::ParseLocation::Field(#error_location)))
663663
};
@@ -767,7 +767,7 @@ fn generate_struct_read_block(
767767
let mut recurse = vec![];
768768

769769
for (i, f) in fields.unnamed.iter().enumerate() {
770-
let read_op = generate_read_element(struct_name, f, &format!("{}", i), false)?;
770+
let read_op = generate_read_element(struct_name, f, &format!("{i}"), false)?;
771771

772772
recurse.push(quote::quote_spanned! {f.span() =>
773773
#read_op,
@@ -820,7 +820,7 @@ fn generate_enum_read_block(
820820
let ty = &field.ty;
821821
let ident = &variant.ident;
822822

823-
let error_location = format!("{}::{}", name, ident);
823+
let error_location = format!("{name}::{ident}");
824824
let add_error_location = quote::quote! {
825825
.map_err(|e| e.add_location(asn1::ParseLocation::Field(#error_location)))
826826
};
@@ -1107,7 +1107,7 @@ fn oid_expand(item: proc_macro::TokenStream) -> syn::Result<proc_macro2::TokenSt
11071107
.map_err(|e| {
11081108
syn::Error::new(
11091109
proc_macro2::Span::call_site(),
1110-
format!("Error parsing OID: {}", e),
1110+
format!("Error parsing OID: {e}"),
11111111
)
11121112
})?;
11131113

@@ -1145,7 +1145,7 @@ fn oid_expand(item: proc_macro::TokenStream) -> syn::Result<proc_macro2::TokenSt
11451145
if der_len > 63 {
11461146
return Err(syn::Error::new(
11471147
proc_macro2::Span::call_site(),
1148-
format!("OID too long: {} bytes > 63 bytes", der_len),
1148+
format!("OID too long: {der_len} bytes > 63 bytes"),
11491149
));
11501150
}
11511151

src/object_identifier.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ mod tests {
193193
#[test]
194194
fn test_debug() {
195195
let oid = ObjectIdentifier::from_string("1.2.3.4").unwrap();
196-
assert_eq!(format!("{:?}", oid), "ObjectIdentifier { oid: 1.2.3.4 }");
196+
assert_eq!(format!("{oid:?}"), "ObjectIdentifier { oid: 1.2.3.4 }");
197197
}
198198

199199
#[test]

src/parser.rs

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,14 @@ impl fmt::Display for ParseError {
140140
ParseErrorKind::InvalidSize { min, max, actual } => {
141141
write!(
142142
f,
143-
"invalid container size (expected between {} and {}, got {})",
144-
min, max, actual
143+
"invalid container size (expected between {min} and {max}, got {actual})"
145144
)
146145
}
147146
ParseErrorKind::UnexpectedTag { actual } => {
148-
write!(f, "unexpected tag (got {:?})", actual)
147+
write!(f, "unexpected tag (got {actual:?})")
149148
}
150149
ParseErrorKind::ShortData { needed } => {
151-
write!(
152-
f,
153-
"short data (needed at least {} additional bytes)",
154-
needed
155-
)
150+
write!(f, "short data (needed at least {needed} additional bytes)")
156151
}
157152
ParseErrorKind::IntegerOverflow => write!(f, "integer overflow"),
158153
ParseErrorKind::ExtraData => write!(f, "extra data"),
@@ -438,7 +433,7 @@ mod tests {
438433
"ParseError { kind: InvalidValue, location: [\"Abc::123\", 12] }",
439434
),
440435
] {
441-
assert_eq!(&format!("{:?}", e), expected);
436+
assert_eq!(&format!("{e:?}"), expected);
442437
}
443438
}
444439

@@ -500,7 +495,7 @@ mod tests {
500495
),
501496
]
502497
{
503-
assert_eq!(&format!("{}", e), expected);
498+
assert_eq!(&format!("{e}"), expected);
504499
}
505500
}
506501

0 commit comments

Comments
 (0)