.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Continuous integration
 
 env:
   VERSION_FEATURES: "v1 v3 v4 v5 v6 v7 v8"
-  DEP_FEATURES: "slog serde arbitrary zerocopy"
+  DEP_FEATURES: "slog serde arbitrary borsh zerocopy"
 
 on:
   pull_request:

Cargo.toml

@@ -27,13 +27,13 @@ homepage = "https://github.com/uuid-rs/uuid"
 name = "uuid"
 readme = "README.md"
 repository = "https://github.com/uuid-rs/uuid"
-version = "1.3.4" # remember to update html_root_url in lib.rs
+version = "1.4.0" # remember to update html_root_url in lib.rs
 
 [package.metadata.docs.rs]
 rustc-args = ["--cfg", "uuid_unstable"]
 rustdoc-args = ["--cfg", "uuid_unstable"]
 targets = ["x86_64-unknown-linux-gnu"]
-features = ["serde", "arbitrary", "slog", "v1", "v3", "v4", "v5", "v6", "v7", "v8"]
+features = ["serde", "arbitrary", "slog", "borsh", "v1", "v3", "v4", "v5", "v6", "v7", "v8"]
 
 [package.metadata.playground]
 features = ["serde", "v1", "v3", "v4", "v5", "v6", "v7", "v8"]
@@ -95,6 +95,14 @@ version = "1.1.3"
 optional = true
 version = "0.6"
 
+# Public (unstable): Used in trait impls on `Uuid`
+# Unstable: also need RUSTFLAGS="--cfg uuid_unstable" to work
+# This feature may break between releases, or be removed entirely before
+# stabilization.
+[dependencies.borsh]
+optional = true
+version = "0.10.3"
+
 # Private
 # Don't depend on this optional feature directly: it may change at any time
 # use the `rng` feature instead
@@ -134,7 +142,7 @@ version = "1"
 # Use the `macro-diagnostics` feature instead
 [dependencies.uuid-macro-internal]
 package = "uuid-macro-internal"
-version = "1.3.4"
+version = "1.4.0"
 path = "macros"
 optional = true
 
@@ -165,7 +173,7 @@ version = "1.0.56"
 package = "wasm-bindgen"
 version = "0.2"
 
-[target.'cfg(target = "wasm32-unknown-unknown")'.dev-dependencies.wasm-bindgen-test]
+[target.'cfg(all(target_arch = "wasm32", target_vendor = "unknown", target_os = "unknown"))'.dev-dependencies.wasm-bindgen-test]
 version = "0.3"
 
 [dev-dependencies.trybuild]

README.md

@@ -29,7 +29,7 @@ Add the following to your `Cargo.toml`:
 
 ```toml
 [dependencies.uuid]
-version = "1.3.4"
+version = "1.4.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.3.4/uuid).
+For more details on using `uuid`, [see the library documentation](https://docs.rs/uuid/1.4.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.3.4/uuid).
+* [`uuid` library docs](https://docs.rs/uuid/1.4.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.3.4"
+version = "1.4.0"
 edition = "2018"
 authors = [
     "QnnOkabayashi"

src/external.rs

@@ -1,5 +1,7 @@
 #[cfg(feature = "arbitrary")]
 pub(crate) mod arbitrary_support;
+#[cfg(all(uuid_unstable, feature = "borsh"))]
+pub(crate) mod borsh_support;
 #[cfg(feature = "serde")]
 pub(crate) mod serde_support;
 #[cfg(feature = "slog")]

src/external/arbitrary_support.rs

@@ -12,7 +12,7 @@ impl Arbitrary<'_> for Uuid {
         Ok(Builder::from_random_bytes(b).into_uuid())
     }
 
-    fn size_hint(depth: usize) -> (usize, Option<usize>) {
+    fn size_hint(_: usize) -> (usize, Option<usize>) {
         (16, Some(16))
     }
 }

src/external/borsh_support.rs

@@ -0,0 +1,24 @@
+#[cfg(test)]
+mod borsh_tests {
+    use crate::Uuid;
+    use borsh::{BorshDeserialize, BorshSerialize};
+    use std::string::ToString;
+
+    #[test]
+    fn test_serialize() {
+        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let uuid = Uuid::parse_str(uuid_str).unwrap();
+        let uuid_bytes = uuid.as_bytes().to_vec();
+        let borsh_bytes = uuid.try_to_vec().unwrap();
+        assert_eq!(uuid_bytes, borsh_bytes);
+    }
+
+    #[test]
+    fn test_deserialize() {
+        let uuid_str = "f9168c5e-ceb2-4faa-b6bf-329bf39fa1e4";
+        let uuid = Uuid::parse_str(uuid_str).unwrap();
+        let uuid_bytes = uuid.as_bytes().to_vec();
+        let deserialized = Uuid::try_from_slice(&uuid_bytes).unwrap().to_string();
+        assert_eq!(uuid_str, deserialized);
+    }
+}