clippy: Miscellaneous minor changes

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

diff --git a/src/gamestate.rs b/src/gamestate.rs
index aba70d147e9cf521fb42972871b3962a14caf6e4..7571c1b6275dbe4d5f44e0013e2139486a000a78 100644 (file)
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -298,6 +298,7 @@ pub struct UniqueGenGen<'g> {
 }
 
 impl UniqueGenGen<'_> {
+  #[allow(clippy::should_implement_trait)] // we don't return Option
   pub fn next(&mut self) -> Generation {
     if self.none_yet.next().is_some() { self.gen.increment() }
     let r = *self.gen;
@@ -340,10 +341,11 @@ pub trait ClampTable: Sized+Debug {
 }
 
 impl ClampTable for Coord {
-  fn clamped(self, range: Coord) -> Result<Coord, PosOffTableError<Coord>> {
-    if self < 0     { return Err(PosOffTableError{ clamped: 0,    }) }
-    if self > range { return Err(PosOffTableError{ clamped: range }) }
-    return Ok(self)
+  #[throws(PosOffTableError<Coord>)]
+  fn clamped(self, range: Coord) -> Coord {
+    if self < 0     { throw!(PosOffTableError{ clamped: 0,    }) }
+    if self > range { throw!(PosOffTableError{ clamped: range }) }
+    self
   }
 }