Cargo.toml

@@ -27,7 +27,7 @@ homepage = "https://github.com/uuid-rs/uuid"
 name = "uuid"
 readme = "README.md"
 repository = "https://github.com/uuid-rs/uuid"
-version = "1.2.2" # remember to update html_root_url in lib.rs
+version = "1.3.0" # remember to update html_root_url in lib.rs
 
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "uuid_unstable"]
@@ -134,7 +134,7 @@ version = "1"
 # Use the `macro-diagnostics` feature instead
 [dependencies.uuid-macro-internal]
 package = "uuid-macro-internal"
-version = "1.2.2"
+version = "1.3.0"
 path = "macros"
 optional = true
 
@@ -175,7 +175,7 @@ version = "1.0.52"
 version = "1"
 
 [target.'cfg(windows)'.dev-dependencies.windows-sys]
-version = "0.42.0"
+version = "0.45.0"
 features = ["Win32_System_Com"]
 
 [workspace]

README.md

@@ -29,7 +29,7 @@ Add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies.uuid]
-version = "1.2.2"
+version = "1.3.0"
 features = [
     "v4",                # Lets you generate random UUIDs
     "fast-rng",          # Use a faster (but still sufficiently random) RNG
@@ -66,7 +66,7 @@ assert_eq!(Some(Version::Random), my_uuid.get_version());
 If you'd like to parse UUIDs _really_ fast, check out the [`uuid-simd`](https://github.com/nugine/uuid-simd)
 library.
 
-For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.2.2/uuid).
+For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.3.0/uuid).
 
 ## Minimum Supported Rust Version (MSRV)
 
@@ -75,7 +75,7 @@ CI. It may be bumped in minor releases as necessary.
 
 ## References
 
-* [`uuid` library docs](https://docs.rs/uuid/1.2.2/uuid).
+* [`uuid` library docs](https://docs.rs/uuid/1.3.0/uuid).
 * [Wikipedia: Universally Unique Identifier](http://en.wikipedia.org/wiki/Universally_unique_identifier).
 * [RFC4122: A Universally Unique IDentifier (UUID) URN Namespace](http://tools.ietf.org/html/rfc4122).
 

macros/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "uuid-macro-internal"
-version = "1.2.2"
+version = "1.3.0"
 edition = "2018"
 authors = [
     "QnnOkabayashi"

src/error.rs

@@ -134,7 +134,7 @@ impl fmt::Display for Error {
             ErrorKind::Char {
                 character, index, ..
             } => {
-                write!(f, "invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-zA-Z], found `{}` at {}", character, index)
+                write!(f, "invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `{}` at {}", character, index)
             }
             ErrorKind::SimpleLength { len } => {
                 write!(

src/external/arbitrary_support.rs

@@ -11,6 +11,10 @@ impl Arbitrary<'_> for Uuid {
 
         Ok(Builder::from_random_bytes(b).into_uuid())
     }
+
+    fn size_hint(depth: usize) -> (usize, Option<usize>) {
+        (16, Some(16))
+    }
 }
 
 #[cfg(test)]

src/external/serde_support.rs

@@ -302,7 +302,7 @@ mod serde_tests {
     fn test_de_failure() {
         serde_test::assert_de_tokens_error::<Readable<Uuid>>(
             &[Token::Str("hello_world")],
-            "UUID parsing failed: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-zA-Z], found `h` at 1",
+            "UUID parsing failed: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found `h` at 1",
         );
 
         serde_test::assert_de_tokens_error::<Compact<Uuid>>(

src/fmt.rs

@@ -42,22 +42,14 @@ impl fmt::Display for Variant {
 
 impl fmt::LowerHex for Uuid {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if f.alternate() {
-            fmt::LowerHex::fmt(self.as_simple(), f)
-        } else {
-            fmt::LowerHex::fmt(self.as_hyphenated(), f)
-        }
+        fmt::LowerHex::fmt(self.as_hyphenated(), f)
     }
 }
 
 impl fmt::UpperHex for Uuid {
     #[inline]
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if f.alternate() {
-            fmt::UpperHex::fmt(self.as_simple(), f)
-        } else {
-            fmt::UpperHex::fmt(self.as_hyphenated(), f)
-        }
+        fmt::UpperHex::fmt(self.as_hyphenated(), f)
     }
 }
 

src/lib.rs

@@ -39,7 +39,7 @@
 //!
 //! ```toml
 //! [dependencies.uuid]
-//! version = "1.2.2"
+//! version = "1.3.0"
 //! features = [
 //!     "v4",                # Lets you generate random UUIDs
 //!     "fast-rng",          # Use a faster (but still sufficiently random) RNG
@@ -138,7 +138,7 @@
 //!
 //! ```toml
 //! [dependencies.uuid]
-//! version = "1.2.2"
+//! version = "1.3.0"
 //! features = [
 //!     "v4",
 //!     "v7",
@@ -153,7 +153,7 @@
 //!
 //! ```toml
 //! [dependencies.uuid]
-//! version = "1.2.2"
+//! version = "1.3.0"
 //! default-features = false
 //! ```
 //!
@@ -211,7 +211,7 @@
 #![doc(
     html_logo_url = "https://www.rust-lang.org/logos/rust-logo-128x128-blk-v2.png",
     html_favicon_url = "https://www.rust-lang.org/favicon.ico",
-    html_root_url = "https://docs.rs/uuid/1.2.2"
+    html_root_url = "https://docs.rs/uuid/1.3.0"
 )]
 
 #[cfg(any(feature = "std", test))]
@@ -1219,8 +1219,8 @@ mod tests {
         check!(buf, "{:X}", u, 36, |c| c.is_uppercase()
             || c.is_digit(10)
             || c == '-');
-        check!(buf, "{:#x}", u, 32, |c| c.is_lowercase() || c.is_digit(10));
-        check!(buf, "{:#X}", u, 32, |c| c.is_uppercase() || c.is_digit(10));
+        check!(buf, "{:#x}", u, 36, |c| c.is_lowercase() || c.is_digit(10) || c == '-');
+        check!(buf, "{:#X}", u, 36, |c| c.is_uppercase() || c.is_digit(10) || c == '-');
 
         check!(buf, "{:X}", u.hyphenated(), 36, |c| c.is_uppercase()
             || c.is_digit(10)

src/macros.rs

@@ -72,7 +72,7 @@ define_uuid_macro! {
 /// Provides the following compilation error:
 ///
 /// ```txt
-/// error: invalid character: expected an optional prefix of `urn:uuid:` followed by 0123456789abcdefABCDEF-, found Z at 9
+/// error: invalid character: expected an optional prefix of `urn:uuid:` followed by [0-9a-fA-F-], found Z at 9
 ///     |
 ///     |     let id = uuid!("F9168C5E-ZEB2-4FAA-B6BF-329BF39FA1E4");
 ///     |                              ^