Merge pull request #806 from tysen/add-fromstr-impls-to-fmt

Add FromStr impls to the fmt structs

src/fmt.rs

@@ -11,9 +11,11 @@
 
 //! Adapters for alternative string formats.
 
+use core::str::FromStr;
+
 use crate::{
     std::{borrow::Borrow, fmt, ptr, str},
-    Uuid, Variant,
+    Error, Uuid, Variant,
 };
 
 #[cfg(feature = "std")]
@@ -829,6 +831,46 @@ impl Urn {
     }
 }
 
+impl FromStr for Hyphenated {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        crate::parser::parse_hyphenated(s.as_bytes())
+            .map(|b| Hyphenated(Uuid(b)))
+            .map_err(|invalid| invalid.into_err())
+    }
+}
+
+impl FromStr for Simple {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        crate::parser::parse_simple(s.as_bytes())
+            .map(|b| Simple(Uuid(b)))
+            .map_err(|invalid| invalid.into_err())
+    }
+}
+
+impl FromStr for Urn {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        crate::parser::parse_urn(s.as_bytes())
+            .map(|b| Urn(Uuid(b)))
+            .map_err(|invalid| invalid.into_err())
+    }
+}
+
+impl FromStr for Braced {
+    type Err = Error;
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        crate::parser::parse_braced(s.as_bytes())
+            .map(|b| Braced(Uuid(b)))
+            .map_err(|invalid| invalid.into_err())
+    }
+}
+
 macro_rules! impl_fmt_traits {
     ($($T:ident<$($a:lifetime),*>),+) => {$(
         impl<$($a),*> fmt::Display for $T<$($a),*> {

src/parser.rs

@@ -205,7 +205,7 @@ pub(crate) const fn parse_simple(s: &[u8]) -> Result<[u8; 16], InvalidUuid> {
 }
 
 #[inline]
-const fn parse_hyphenated(s: &[u8]) -> Result<[u8; 16], InvalidUuid> {
+pub(crate) const fn parse_hyphenated(s: &[u8]) -> Result<[u8; 16], InvalidUuid> {
     // This length check here removes all other bounds
     // checks in this function
     if s.len() != 36 {

src/rng.rs

@@ -104,7 +104,11 @@ mod imp {
 
     use super::*;
 
-    #[cfg(all(not(feature = "js"), not(feature = "rng-getrandom"), not(feature = "rng-rand")))]
+    #[cfg(all(
+        not(feature = "js"),
+        not(feature = "rng-getrandom"),
+        not(feature = "rng-rand")
+    ))]
     compile_error!("to use `uuid` on `wasm32-unknown-unknown`, specify a source of randomness using one of the `js`, `rng-getrandom`, or `rng-rand` features");
 
     // Using `rand`
@@ -249,7 +253,7 @@ mod imp {
         */
 
         use wasm_bindgen::{prelude::wasm_bindgen, JsValue};
-    
+
         #[cfg(target_feature = "atomics")]
         use core::convert::TryInto;