RUST-2169 Clean up and future-proof features (#544)

Author: abr-egn

Cargo.lock

@@ -33,24 +33,18 @@ exclude = [
 ]
 
 [features]
-default = []
+default = ["compat-3-0-0"]
+compat-3-0-0 = []
 # if enabled, include API for interfacing with chrono 0.4
-chrono-0_4 = ["chrono"]
+chrono-0_4 = ["dep:chrono"]
 # 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, implement Hash/Eq for Bson and Document
-hashable = []
-# If enabled, the maximum document size will be increased from the MongoDB cap
-# of 16 MB to the BSON spec maximum size of 2^31 - 1
-uncapped_max_size = []
 serde_path_to_error = ["dep:serde_path_to_error"]
 # if enabled, include serde_with interop.
 # should be used in conjunction with chrono-0_4 or uuid-0_8.
-# it's commented out here because Cargo implicitly adds a feature flag for
-# all optional dependencies.
-# serde_with
+serde_with-3 = ["dep:serde_with"]
 
 [lib]
 name = "bson"
@@ -67,8 +61,7 @@ base64 = "0.22.1"
 once_cell = "1.5.1"
 uuid = { version = "1.1.2", features = ["serde", "v4"] }
 serde_bytes = "0.11.5"
-serde_with = { version = "1.3.1", optional = true }
-serde_with-3 = { package = "serde_with", version = "3.1.0", optional = true }
+serde_with = { version = "3.1.0", optional = true }
 time = { version = "0.3.9", features = ["formatting", "parsing", "macros", "large-dates"] }
 bitvec = "1.0.1"
 serde_path_to_error = { version = "0.1.16", optional = true }

Cargo.toml

@@ -50,11 +50,9 @@ 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`](https://docs.rs/chrono/0.4) crate in the public API.              | n/a                | no      |
 | `uuid-1`     | Enable support for v1.x of the [`uuid`](https://docs.rs/uuid/1.0) crate in the public API.                  | n/a                | no      |
 | `time-0_3`   | Enable support for v0.3 of the [`time`](https://docs.rs/time/0.3) crate in the public API.                  | n/a                | no      |
-| `serde_with` | Enable [`serde_with`](https://docs.rs/serde_with/1.x) 1.x integrations for `bson::DateTime` and `bson::Uuid`.| serde_with         | no      |
 | `serde_with-3` | Enable [`serde_with`](https://docs.rs/serde_with/3.x) 3.x integrations for `bson::DateTime` and `bson::Uuid`.| serde_with         | no      |
 | `serde_path_to_error` | Enable support for error paths via integration with [`serde_path_to_error`](https://docs.rs/serde_path_to_err/latest).  This is an unstable feature and any breaking changes to `serde_path_to_error` may affect usage of it via this feature.  | serde_path_to_error  | no |
-| `hashable`   | Implement `core::hash::Hash` and `std::cmp::Eq` on `Bson` and `Document`.                  | n/a                | no      |
-| `uncapped_max_size` | Increase the maximum document size from the MongoDB cap of 16 MB to the BSON spec maximum size of 2^31 - 1 bytes. | n/a | no |
+| `compat-3-0-0` | Required for future compatibility if default features are disabled. | no |
 
 ## Overview of the BSON Format
 

README.md

@@ -8,11 +8,11 @@ edition = "2018"
 default = []
 
 [dependencies]
-bson = { path = "..", features = ["uuid-1", "chrono-0_4", "serde_with"] }
+bson = { path = "..", features = ["uuid-1", "chrono-0_4", "serde_with-3"] }
 serde = { version = "1.0", features = ["derive"] }
 pretty_assertions = "0.6.1"
 hex = "0.4.2"
-serde_with = "1"
+serde_with = "3"
 chrono = "0.4"
 uuid = "1"
 

serde-tests/Cargo.lock

@@ -90,7 +90,6 @@ pub enum Bson {
 /// Alias for `Vec<Bson>`.
 pub type Array = Vec<Bson>;
 
-#[cfg(feature = "hashable")]
 impl Hash for Bson {
     fn hash<H: std::hash::Hasher>(&self, state: &mut H) {
         match self {
@@ -125,7 +124,6 @@ impl Hash for Bson {
     }
 }
 
-#[cfg(feature = "hashable")]
 impl Eq for Bson {}
 
 impl Display for Bson {
@@ -1154,8 +1152,7 @@ impl Display for Regex {
 }
 
 /// Represents a BSON code with scope value.
-#[derive(Debug, Clone, PartialEq)]
-#[cfg_attr(feature = "hashable", derive(Eq, Hash))]
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
 pub struct JavaScriptCodeWithScope {
     /// The JavaScript code.
     pub code: String,