From d4ac7596dafb253d6e5ee33cf763478898b94224 Mon Sep 17 00:00:00 2001 From: Nilstrieb <48135649+Nilstrieb@users.noreply.github.com> Date: Sun, 2 Oct 2022 12:06:17 +0200 Subject: [PATCH] Clippy lints --- src/formatter.rs | 24 ++++++++++++------------ src/rust_core_impl/aggregated.rs | 2 +- src/rust_core_impl/mod.rs | 4 ++-- src/write.rs | 2 +- tests/base.rs | 7 +++++++ 5 files changed, 23 insertions(+), 16 deletions(-) diff --git a/src/formatter.rs b/src/formatter.rs index b1717d2..20ef4d3 100644 --- a/src/formatter.rs +++ b/src/formatter.rs @@ -29,15 +29,15 @@ impl Formatter { self.buf.write_str(str) } - pub fn debug_list<'b>(&'b mut self) -> DebugList<'b, W, O> { + pub fn debug_list(&mut self) -> DebugList<'_, W, O> { debug_list_new(self) } - pub fn debug_set<'b>(&'b mut self) -> DebugSet<'b, W, O> { + pub fn debug_set(&mut self) -> DebugSet<'_, W, O> { debug_set_new(self) } - pub fn debug_map<'b>(&'b mut self) -> DebugMap<'b, W, O> { + pub fn debug_map(&mut self) -> DebugMap<'_, W, O> { debug_map_new(self) } @@ -311,9 +311,9 @@ pub struct DebugSet<'a, W, O> { inner: DebugInner<'a, W, O>, } -pub(super) fn debug_set_new<'a, W: Write, O: FmtOpts>( - fmt: &'a mut fmt::Formatter, -) -> DebugSet<'a, W, O> { +pub(super) fn debug_set_new( + fmt: &mut fmt::Formatter, +) -> DebugSet<'_, W, O> { let result = fmt.write_str("{"); DebugSet { inner: DebugInner { @@ -354,9 +354,9 @@ pub struct DebugList<'a, W, O> { inner: DebugInner<'a, W, O>, } -pub(super) fn debug_list_new<'a, W: Write, O: FmtOpts>( - fmt: &'a mut fmt::Formatter, -) -> DebugList<'a, W, O> { +pub(super) fn debug_list_new( + fmt: &mut fmt::Formatter, +) -> DebugList<'_, W, O> { let result = fmt.write_str("["); DebugList { inner: DebugInner { @@ -402,9 +402,9 @@ pub struct DebugMap<'a, W, O> { state: PadAdapterState, } -pub(super) fn debug_map_new<'a, 'b, W: Write, O: FmtOpts>( - fmt: &'a mut fmt::Formatter, -) -> DebugMap<'a, W, O> { +pub(super) fn debug_map_new( + fmt: &mut fmt::Formatter, +) -> DebugMap<'_, W, O> { let result = fmt.write_str("{"); DebugMap { fmt, diff --git a/src/rust_core_impl/aggregated.rs b/src/rust_core_impl/aggregated.rs index 016d114..c15bceb 100644 --- a/src/rust_core_impl/aggregated.rs +++ b/src/rust_core_impl/aggregated.rs @@ -8,7 +8,7 @@ mod impl_prelude { impl Debug for [T; N] { fn fmt(&self, f: &mut Formatter) -> Result { - <[T] as Debug>::fmt(&&self[..], f) + <[T] as Debug>::fmt(&self[..], f) } } diff --git a/src/rust_core_impl/mod.rs b/src/rust_core_impl/mod.rs index 051e868..16fa00f 100644 --- a/src/rust_core_impl/mod.rs +++ b/src/rust_core_impl/mod.rs @@ -333,10 +333,10 @@ impl Formatter { // here. s.get(..i).unwrap_or(s) } else { - &s + s } } else { - &s + s }; // The `width` field is more of a `min-width` parameter at this point. match self.width() { diff --git a/src/write.rs b/src/write.rs index ac27f9c..fd2f773 100644 --- a/src/write.rs +++ b/src/write.rs @@ -23,7 +23,7 @@ impl Write for &'_ mut [u8] { return Err(Error); } - let (a, b) = core::mem::replace(self, &mut []).split_at_mut(data.len()); + let (a, b) = core::mem::take(self).split_at_mut(data.len()); a.copy_from_slice(data); *self = b; Ok(()) diff --git a/tests/base.rs b/tests/base.rs index 2c52691..c034687 100644 --- a/tests/base.rs +++ b/tests/base.rs @@ -29,3 +29,10 @@ fn only_eval_once() { }); assert_eq!(evil.get(), 1); } + +#[test] +fn dont_move() { + let string = "uwu".to_string(); + let _ = format!("{string}"); + assert_eq!("uwu", string); +}