RUST-1305 Add support for version 1.x of the uuid crate to the bson crate (#362)

Author: abr-egn

.evergreen/check-clippy.sh

@@ -1,8 +1,10 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 
 . ~/.cargo/env
+
 cargo clippy --all-targets --all-features -p bson -- -D warnings
 
-cd serde-tests && cargo clippy --all-targets --all-features -p serde-tests -- -D warnings
+cd serde-tests
+cargo clippy --all-targets --all-features -p serde-tests -- -D warnings

.evergreen/check-rustdoc.sh

@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 
 . ~/.cargo/env
-cargo +nightly rustdoc -p bson --all-features -- --cfg docsrs -D warnings
+
+cargo +nightly rustdoc -p bson --all-features -- --cfg docsrs -D warnings

.evergreen/check-rustfmt.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 

.evergreen/compile-only.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 

.evergreen/install-dependencies.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 rm -rf ~/.rustup
 curl https://sh.rustup.rs -sSf | sh -s -- -y --no-modify-path

.evergreen/install-fuzzer.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 

.evergreen/run-fuzzer.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 

.evergreen/run-tests.sh

@@ -1,8 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 
 . ~/.cargo/env
+
 RUST_BACKTRACE=1 cargo test
 RUST_BACKTRACE=1 cargo test --all-features
 

Cargo.toml

@@ -35,7 +35,11 @@ default = []
 # if enabled, include API for interfacing with chrono 0.4
 chrono-0_4 = ["chrono"]
 # if enabled, include API for interfacing with uuid 0.8
-uuid-0_8 = []
+# This is commented out because Cargo implicitly adds this feature since
+# uuid-0_8 is also an optional dependency.
+# uuid-0_8 = []
+# if enabled, include API for interfacing with uuid 1.x
+uuid-1 = []
 # if enabled, include API for interfacing with time 0.3
 time-0_3 = []
 # if enabled, include serde_with interop.
@@ -57,7 +61,8 @@ indexmap = "1.6.2"
 hex = "0.4.2"
 base64 = "0.13.0"
 lazy_static = "1.4.0"
-uuid = { version = "0.8.1", features = ["serde", "v4"] }
+uuid-0_8 = { package = "uuid", version = "0.8.1", features = ["serde", "v4"], optional = true }
+uuid = { version = "1.1.2", features = ["serde", "v4"] }
 serde_bytes = "0.11.5"
 serde_with = { version = "1", optional = true }
 time = { version = "0.3.9", features = ["formatting", "parsing", "macros", "large-dates"] }

README.md

@@ -48,6 +48,7 @@ Note that if you are using `bson` through the `mongodb` crate, you do not need t
 |:-------------|:----------------------------------------------------------------------------------------------------|:-------------------|:--------|
 | `chrono-0_4` | Enable support for v0.4 of the [`chrono`](docs.rs/chrono/0.4) crate in the public API.              | n/a                | no      |
 | `uuid-0_8`   | Enable support for v0.8 of the [`uuid`](docs.rs/uuid/0.8) crate in the public API.                  | n/a                | no      |
+| `uuid-1`     | Enable support for v1.x of the [`uuid`](docs.rs/uuid/1.0) crate in the public API.                  | n/a                | no      |
 | `serde_with` | Enable [`serde_with`](docs.rs/serde_with/latest) integrations for `bson::DateTime` and `bson::Uuid` | serde_with         | no      |
 
 ## Overview of the BSON Format

src/bson.rs

@@ -328,6 +328,14 @@ impl<T: chrono::TimeZone> From<chrono::DateTime<T>> for Bson {
 
 #[cfg(feature = "uuid-0_8")]
 #[cfg_attr(docsrs, doc(cfg(feature = "uuid-0_8")))]
+impl From<uuid_0_8::Uuid> for Bson {
+    fn from(uuid: uuid_0_8::Uuid) -> Self {
+        Bson::Binary(uuid.into())
+    }
+}
+
+#[cfg(feature = "uuid-1")]
+#[cfg_attr(docsrs, doc(cfg(feature = "uuid-1")))]
 impl From<uuid::Uuid> for Bson {
     fn from(uuid: uuid::Uuid) -> Self {
         Bson::Binary(uuid.into())