From b7c6e26feabcb32e482410ffe58640deb61bd89a Mon Sep 17 00:00:00 2001
From: KodrAus <kodraus@hey.com>
Date: Fri, 19 Jan 2024 09:32:56 +1000
Subject: [PATCH] make use of newer Cargo features for specifying dependencies

---
 Cargo.toml | 41 ++++++++++++-----------------------------
 src/lib.rs |  2 +-
 src/md5.rs |  2 +-
 3 files changed, 14 insertions(+), 31 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index c5639abc..a2a983dc 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -54,7 +54,7 @@ status = "actively-developed"
 [features]
 default = ["std"]
 std = []
-macro-diagnostics = ["uuid-macro-internal"]
+macro-diagnostics = ["dep:uuid-macro-internal"]
 
 # NOTE: When adding new features, check the `ci.yml` workflow
 # and include them where necessary (you can follow along with existing features)
@@ -66,17 +66,17 @@ v6 = ["atomic"]
 v7 = ["atomic", "rng"]
 v8 = []
 
-js = ["wasm-bindgen", "getrandom", "getrandom/js"]
+js = ["dep:wasm-bindgen", "getrandom?/js"]
 
-rng = ["getrandom"]
-fast-rng = ["rng", "rand"]
+rng = ["dep:getrandom"]
+fast-rng = ["rng", "dep:rand"]
 
-sha1 = ["sha1_smol"]
-md5 = ["md-5"]
+sha1 = ["dep:sha1_smol"]
+md5 = ["dep:md-5"]
+atomic = ["dep:atomic"]
 
 borsh = ["dep:borsh", "dep:borsh-derive"]
 
-
 # Public: Used in trait impls on `Uuid`
 [dependencies.bytemuck]
 version = "1.14.0"
@@ -115,65 +115,49 @@ version = "1"
 default-features = false
 
 # Private
-# Don't depend on this optional feature directly: it may change at any time
-# use the `borsh` feature instead
 [dependencies.borsh-derive]
-package = "borsh-derive"
 optional = true
 version = "1"
 default-features = false
 
-# Private
-# Don't depend on this optional feature directly: it may change at any time
-# use the `rng` feature instead
+# Public
+# Usage of `getrandom`'s pluggable randomness for custom targets is documented
+# in `uuid`'s library docs
 [dependencies.getrandom]
-package = "getrandom"
 optional = true
 version = "0.2"
 
 # Private
-# Don't depend on this optional feature directly: it may change at any time
-# use the `fast-rng` feature instead
 [dependencies.rand]
-package = "rand"
 optional = true
 version = "0.8"
 
 # Private
-# Don't depend on this optional feature directly: it may change at any time
-# Use the `md5` feature instead
 [dependencies.md-5]
-package = "md-5"
 default-features = false
 optional = true
 version = "0.10"
 
 # Private
-# Don't depend on this optional feature directly: it may change at any time
-# Use the `sha1` feature instead
 [dependencies.sha1_smol]
-package = "sha1_smol"
 default-features = false
 optional = true
 version = "1"
 
 # Public: Re-exported
-# Don't depend on this optional feature directly: it may change at any time
-# Use the `macro-diagnostics` feature instead
 [dependencies.uuid-macro-internal]
-package = "uuid-macro-internal"
 version = "1.6.1"
 path = "macros"
 optional = true
 
+# Private
 [dependencies.atomic]
-package = "atomic"
 default-features = false
 optional = true
 version = "0.5"
 
+# Private
 [dependencies.wasm-bindgen]
-package = "wasm-bindgen"
 version = "0.2"
 optional = true
 
@@ -190,7 +174,6 @@ version = "1.0"
 version = "1.0.56"
 
 [target.'cfg(target = "wasm32-unknown-unknown")'.dev-dependencies.wasm-bindgen]
-package = "wasm-bindgen"
 version = "0.2"
 
 [target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown"))'.dev-dependencies.wasm-bindgen-test]
diff --git a/src/lib.rs b/src/lib.rs
index 98b2939b..10afdd9e 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -169,7 +169,7 @@
 //! follow [`getrandom`'s docs] on configuring a source of randomness
 //! on currently unsupported targets. Alternatively, you can produce
 //! random bytes yourself and then pass them to [`Builder::from_random_bytes`]
-//! without enabling the `v4` feature.
+//! without enabling the `v4` or `v7` features.
 //!
 //! # Examples
 //!
diff --git a/src/md5.rs b/src/md5.rs
index fce5d9b8..a746f22f 100644
--- a/src/md5.rs
+++ b/src/md5.rs
@@ -1,6 +1,6 @@
 #[cfg(feature = "v3")]
 pub(crate) fn hash(ns: &[u8], src: &[u8]) -> [u8; 16] {
-    use md_5::{Digest, Md5};
+    use md5::{Digest, Md5};
 
     let mut hasher = Md5::new();