From 2fe4c1af453bc017a8bfa951b76b5e5ff72e86e9 Mon Sep 17 00:00:00 2001 From: Sebastian Zivota Date: Tue, 21 Jan 2025 10:00:13 +0100 Subject: [PATCH] chore: Clippy lints --- src/cache/mod.rs | 4 ++-- src/cache/raw.rs | 2 +- src/java.rs | 2 +- src/mapper.rs | 2 +- src/mapping.rs | 6 +++--- src/stacktrace.rs | 6 +++--- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/cache/mod.rs b/src/cache/mod.rs index 435ef7b..19c599b 100644 --- a/src/cache/mod.rs +++ b/src/cache/mod.rs @@ -412,7 +412,7 @@ pub struct RemappedFrameIter<'r, 'data> { )>, } -impl<'r, 'data> RemappedFrameIter<'r, 'data> { +impl<'data> RemappedFrameIter<'_, 'data> { fn empty() -> Self { Self { inner: None } } @@ -428,7 +428,7 @@ impl<'r, 'data> RemappedFrameIter<'r, 'data> { } } -impl<'r, 'data> Iterator for RemappedFrameIter<'r, 'data> { +impl<'data> Iterator for RemappedFrameIter<'_, 'data> { type Item = StackFrame<'data>; fn next(&mut self) -> Option { diff --git a/src/cache/raw.rs b/src/cache/raw.rs index d8c2955..8650492 100644 --- a/src/cache/raw.rs +++ b/src/cache/raw.rs @@ -122,7 +122,7 @@ pub struct ProguardCache<'data> { pub(crate) string_bytes: &'data [u8], } -impl<'data> std::fmt::Debug for ProguardCache<'data> { +impl std::fmt::Debug for ProguardCache<'_> { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("ProguardCache") .field("version", &self.header.version) diff --git a/src/java.rs b/src/java.rs index 3aa2150..c4a0d30 100644 --- a/src/java.rs +++ b/src/java.rs @@ -95,7 +95,7 @@ fn parse_obfuscated_bytecode_signature(signature: &str) -> Option<(Vec<&str>, &s } } let ty = parameter_types.get(first_idx..last_idx + 1)?; - if ty.is_empty() || !ty.ends_with(&[';']) { + if !ty.ends_with([';']) { return None; } types.push(ty); diff --git a/src/mapper.rs b/src/mapper.rs index db444e9..3467468 100644 --- a/src/mapper.rs +++ b/src/mapper.rs @@ -412,7 +412,7 @@ impl<'s> ProguardMapper<'s> { members.all_mappings.iter() }; - return RemappedFrameIter::members(frame, mappings); + RemappedFrameIter::members(frame, mappings) } /// Remaps a throwable which is the first line of a full stacktrace. diff --git a/src/mapping.rs b/src/mapping.rs index fec31dd..bdafe5a 100644 --- a/src/mapping.rs +++ b/src/mapping.rs @@ -20,7 +20,7 @@ pub struct ParseError<'s> { kind: ParseErrorKind, } -impl<'s> ParseError<'s> { +impl ParseError<'_> { /// The offending line that caused the error. pub fn line(&self) -> &[u8] { self.line @@ -137,7 +137,7 @@ pub struct ProguardMapping<'s> { source: &'s [u8], } -impl<'s> fmt::Debug for ProguardMapping<'s> { +impl fmt::Debug for ProguardMapping<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("ProguardMapping").finish() } @@ -258,7 +258,7 @@ pub struct ProguardRecordIter<'s> { slice: &'s [u8], } -impl<'s> fmt::Debug for ProguardRecordIter<'s> { +impl fmt::Debug for ProguardRecordIter<'_> { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("ProguardRecordIter").finish() } diff --git a/src/stacktrace.rs b/src/stacktrace.rs index fdcd63e..fdfa61d 100644 --- a/src/stacktrace.rs +++ b/src/stacktrace.rs @@ -92,7 +92,7 @@ impl<'s> StackTrace<'s> { } } -impl<'s> Display for StackTrace<'s> { +impl Display for StackTrace<'_> { fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { if let Some(exception) = &self.exception { writeln!(f, "{}", exception)?; @@ -249,7 +249,7 @@ impl<'s> StackFrame<'s> { } } -impl<'s> Display for StackFrame<'s> { +impl Display for StackFrame<'_> { fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { write!( f, @@ -341,7 +341,7 @@ impl<'s> Throwable<'s> { } } -impl<'s> Display for Throwable<'s> { +impl Display for Throwable<'_> { fn fmt(&self, f: &mut Formatter<'_>) -> FmtResult { write!(f, "{}", self.class)?;