Skip to content

Commit 248d6b5

Browse files
authored
chore: Fix 1.88.0 clippy lints (#53)
1 parent 309d4c7 commit 248d6b5

File tree

4 files changed

+20
-20
lines changed

4 files changed

+20
-20
lines changed

src/cache/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ impl<'data> ProguardCache<'data> {
333333
if let Some(line) = lines.next() {
334334
match stacktrace::parse_throwable(line) {
335335
None => match stacktrace::parse_frame(line) {
336-
None => writeln!(&mut stacktrace, "{}", line)?,
336+
None => writeln!(&mut stacktrace, "{line}")?,
337337
Some(frame) => format_frames(&mut stacktrace, line, self.remap_frame(&frame))?,
338338
},
339339
Some(throwable) => {
@@ -348,7 +348,7 @@ impl<'data> ProguardCache<'data> {
348348
.strip_prefix("Caused by: ")
349349
.and_then(stacktrace::parse_throwable)
350350
{
351-
None => writeln!(&mut stacktrace, "{}", line)?,
351+
None => writeln!(&mut stacktrace, "{line}")?,
352352
Some(cause) => {
353353
format_cause(&mut stacktrace, line, self.remap_throwable(&cause))?
354354
}

src/java.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,15 +27,15 @@ fn byte_code_type_to_java_type(byte_code_type: &str, mapper: &ProguardMapper) ->
2727
let obfuscated = chrs.as_str().replace('/', ".");
2828

2929
if let Some(mapped) = mapper.remap_class(&obfuscated) {
30-
return Some(format!("{}{}", mapped, suffix));
30+
return Some(format!("{mapped}{suffix}"));
3131
}
3232

33-
return Some(format!("{}{}", obfuscated, suffix));
33+
return Some(format!("{obfuscated}{suffix}"));
3434
} else if token == '[' {
3535
suffix.push_str("[]");
3636
continue;
3737
} else if let Some(ty) = java_base_types(token) {
38-
return Some(format!("{}{}", ty, suffix));
38+
return Some(format!("{ty}{suffix}"));
3939
}
4040
}
4141
None
@@ -57,15 +57,15 @@ fn byte_code_type_to_java_type_cache(
5757
let obfuscated = chrs.as_str().replace('/', ".");
5858

5959
if let Some(mapped) = cache.remap_class(&obfuscated) {
60-
return Some(format!("{}{}", mapped, suffix));
60+
return Some(format!("{mapped}{suffix}"));
6161
}
6262

63-
return Some(format!("{}{}", obfuscated, suffix));
63+
return Some(format!("{obfuscated}{suffix}"));
6464
} else if token == '[' {
6565
suffix.push_str("[]");
6666
continue;
6767
} else if let Some(ty) = java_base_types(token) {
68-
return Some(format!("{}{}", ty, suffix));
68+
return Some(format!("{ty}{suffix}"));
6969
}
7070
}
7171
None

src/mapper.rs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -450,7 +450,7 @@ impl<'s> ProguardMapper<'s> {
450450
if let Some(line) = lines.next() {
451451
match stacktrace::parse_throwable(line) {
452452
None => match stacktrace::parse_frame(line) {
453-
None => writeln!(&mut stacktrace, "{}", line)?,
453+
None => writeln!(&mut stacktrace, "{line}")?,
454454
Some(frame) => format_frames(&mut stacktrace, line, self.remap_frame(&frame))?,
455455
},
456456
Some(throwable) => {
@@ -465,7 +465,7 @@ impl<'s> ProguardMapper<'s> {
465465
.strip_prefix("Caused by: ")
466466
.and_then(stacktrace::parse_throwable)
467467
{
468-
None => writeln!(&mut stacktrace, "{}", line)?,
468+
None => writeln!(&mut stacktrace, "{line}")?,
469469
Some(cause) => {
470470
format_cause(&mut stacktrace, line, self.remap_throwable(&cause))?
471471
}
@@ -517,9 +517,9 @@ pub(crate) fn format_throwable(
517517
throwable: Option<Throwable<'_>>,
518518
) -> Result<(), FmtError> {
519519
if let Some(throwable) = throwable {
520-
writeln!(stacktrace, "{}", throwable)
520+
writeln!(stacktrace, "{throwable}")
521521
} else {
522-
writeln!(stacktrace, "{}", line)
522+
writeln!(stacktrace, "{line}")
523523
}
524524
}
525525

@@ -531,10 +531,10 @@ pub(crate) fn format_frames<'s>(
531531
let mut remapped = remapped.peekable();
532532

533533
if remapped.peek().is_none() {
534-
return writeln!(stacktrace, "{}", line);
534+
return writeln!(stacktrace, "{line}");
535535
}
536536
for line in remapped {
537-
writeln!(stacktrace, " {}", line)?;
537+
writeln!(stacktrace, " {line}")?;
538538
}
539539

540540
Ok(())
@@ -546,9 +546,9 @@ pub(crate) fn format_cause(
546546
cause: Option<Throwable<'_>>,
547547
) -> Result<(), FmtError> {
548548
if let Some(cause) = cause {
549-
writeln!(stacktrace, "Caused by: {}", cause)
549+
writeln!(stacktrace, "Caused by: {cause}")
550550
} else {
551-
writeln!(stacktrace, "{}", line)
551+
writeln!(stacktrace, "{line}")
552552
}
553553
}
554554

src/stacktrace.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,15 +95,15 @@ impl<'s> StackTrace<'s> {
9595
impl Display for StackTrace<'_> {
9696
fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult {
9797
if let Some(exception) = &self.exception {
98-
writeln!(f, "{}", exception)?;
98+
writeln!(f, "{exception}")?;
9999
}
100100

101101
for frame in &self.frames {
102-
writeln!(f, " {}", frame)?;
102+
writeln!(f, " {frame}")?;
103103
}
104104

105105
if let Some(cause) = &self.cause {
106-
write!(f, "Caused by: {}", cause)?;
106+
write!(f, "Caused by: {cause}")?;
107107
}
108108

109109
Ok(())
@@ -346,7 +346,7 @@ impl Display for Throwable<'_> {
346346
write!(f, "{}", self.class)?;
347347

348348
if let Some(message) = self.message {
349-
write!(f, ": {}", message)?;
349+
write!(f, ": {message}")?;
350350
}
351351

352352
Ok(())

0 commit comments

Comments
 (0)