From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Thu, 31 Mar 2022 19:09:22 +0000 (+0100)
Subject: clippy: Miscellaneous minor changes
X-Git-Tag: otter-1.0.0~34
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=c3e781702d440b5d05ab8d60568a95950dfa667d;p=otter.git

clippy: Miscellaneous minor changes

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/updates.rs b/src/updates.rs
index eb46d394..a9d87f3b 100644
--- a/src/updates.rs
+++ b/src/updates.rs
@@ -634,7 +634,6 @@ impl<'r> PrepareUpdatesBuffer<'r> {
         (Some(gpc), Some(ipc)) => {
           let pri = piece_pri(ioccults, &gs.occults, player,
                               gpl, piece, gpc, ipc);
-          drop(gpl);
           with_max_z(&mut gs.max_z, gpc);
           mk_update(ioccults,gs,gpc,ipc,player,&pri)?
         },
@@ -961,10 +960,10 @@ impl Vec<(PieceId, PieceUpdateOps)> {
   }
 }
 
-impl<'u> Into<FormattedLogEntry<'u>> for TransmitUpdateLogEntry<'u> {
-  fn into(self) -> FormattedLogEntry<'u> {
-    let (tz, logent) = self;
-    let when = logent.when.render(&tz);
+impl<'u> From<TransmitUpdateLogEntry<'u>> for FormattedLogEntry<'u> {
+  fn from(tule: TransmitUpdateLogEntry<'u>) -> FormattedLogEntry<'u> {
+    let (tz, logent) = tule;
+    let when = logent.when.render(tz);
     FormattedLogEntry { when, logent: &logent.logent }
   }
 }
diff --git a/src/utils.rs b/src/utils.rs
index d6030d0f..310d0772 100644
--- a/src/utils.rs
+++ b/src/utils.rs
@@ -48,6 +48,7 @@ pub struct OldNew<T>([T; 2]);
 #[derive(Hash,Eq,PartialEq)]
 pub enum OldNewIndex { Old, New }
 
+#[allow(clippy::new_ret_no_self)]
 impl<T> OldNew<T> {
   pub fn old(&self) -> &T { &self.0[0] }
   pub fn new(&self) -> &T { &self.0[1] }
@@ -74,6 +75,7 @@ impl<T> OldNew<T> {
     self.0.iter()
   }
 
+  #[allow(clippy::should_implement_trait)] // yes, but, TAIT
   pub fn into_iter(self) -> impl Iterator<Item=T> {
     IntoIterator::into_iter(self.0)
   }
@@ -187,13 +189,13 @@ pub mod timespec_serde {
 
   #[throws(S::Error)]
   pub fn serialize<S:Serializer>(v: &TimeSpec, s: S) -> S::Ok {
-    let v = Timespec(v.tv_sec().into(), v.tv_nsec().try_into().unwrap());
+    let v = Timespec(v.tv_sec(), v.tv_nsec().try_into().unwrap());
     Serialize::serialize(&v, s)?
   }
   #[throws(D::Error)]
   pub fn deserialize<'de, D:Deserializer<'de>>(d: D) -> TimeSpec {
     let Timespec(sec, nsec) = Deserialize::deserialize(d)?;
-    libc::timespec { tv_sec: sec.into(), tv_nsec: nsec.into() }.into()
+    libc::timespec { tv_sec: sec, tv_nsec: nsec.into() }.into()
   }
 }
 
@@ -662,9 +664,11 @@ impl<W:Write> Write for SigPipeWriter<W> {
 }
 
 pub type RawStdout = SigPipeWriter<io::Stdout>;
+#[allow(clippy::new_without_default)] // Don't want these made willy-nilly
 impl RawStdout { pub fn new() -> Self { SigPipeWriter(io::stdout()) } }
 
 pub struct CookedStdout(pub BufWriter<SigPipeWriter<io::Stdout>>);
+#[allow(clippy::new_without_default)] // Don't want these made willy-nilly
 impl CookedStdout {
   pub fn new() -> Self { Self(BufWriter::new(RawStdout::new())) }
   fn handle_err(e: io::Error) -> ! {