zcoord: Move from_str impl for Mutable to be FromStr impl

Suggested by clippy.

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

diff --git a/base/zcoord.rs b/base/zcoord.rs
index ebdeda6f10e03523750a31d788ac60447b55eb5e..dcee587dca9f28cd09d7212febffb70d1424d555 100644 (file)
--- a/base/zcoord.rs
+++ b/base/zcoord.rs
@@ -493,9 +493,12 @@ impl Mutable {
       }),
     }
   }
+}
 
+impl FromStr for Mutable {
+  type Err = ParseError;
   #[throws(ParseError)]
-  pub fn from_str(s: &str) -> Mutable {
+  fn from_str(s: &str) -> Mutable {
     let tail = ZCoord::checked(s)?;
     Mutable::from_u8_unchecked(tail)
   }

diff --git a/wasm/wasm.rs b/wasm/wasm.rs
index 77f2bd5b1c81250db22fa9e8f2a52e99c0ab38c0..251ec7cb5c91d9692b1410a1cf7213b489a58d11 100644 (file)
--- a/wasm/wasm.rs
+++ b/wasm/wasm.rs
@@ -8,6 +8,7 @@ use otter_base::imports::*;
 
 use std::fmt::Display;
 use std::collections::hash_map::HashMap;
+use std::str::FromStr;
 
 use extend::ext;
 use fehler::throws;