RUST-1205 Upstream changes from 3.0.x branch (#1128)

Author: abr-egn

.evergreen/release-build-vars.sh

@@ -18,6 +18,7 @@ if [[ "${DRY_RUN:-}" == "yes" ]]; then
 fi
 
 cat <<EOT >release-expansion.yml
+CARGO_REGISTRY_TOKEN: "${CARGO_REGISTRY_TOKEN}"
 CRATE_VERSION: "${CRATE_VERSION}"
 PAPERTRAIL_KEY_ID: "${PAPERTRAIL_KEY_ID}"
 PAPERTRAIL_SECRET_KEY: "${PAPERTRAIL_SECRET_KEY}"

.evergreen/release-danger-do-not-run-manually.sh

@@ -13,8 +13,8 @@ set +x
 
 set -o errexit
 
-if [[ -z "$CRATES_IO_TOKEN" ]]; then
-  echo >&2 "\$CRATES_IO_TOKEN must be set to the crates.io authentication token"
+if [[ -z "$CARGO_REGISTRY_TOKEN" ]]; then
+  echo >&2 "\$CARGO_REGISTRY_TOKEN must be set to the crates.io authentication token"
   exit 1
 fi
 
@@ -32,7 +32,7 @@ if [[ "${PACKAGE_ONLY}" == "yes" ]]; then
   cargo package --no-verify --allow-dirty
 else
   pushd macros
-  cargo publish --token $CRATES_IO_TOKEN ${EXTRA}
+  cargo publish ${EXTRA}
   popd
-  cargo publish --token $CRATES_IO_TOKEN ${EXTRA}
+  cargo publish ${EXTRA}
 fi

Cargo.toml

@@ -16,7 +16,7 @@ homepage = "https://www.mongodb.com/docs/drivers/rust/"
 license = "Apache-2.0"
 readme = "README.md"
 name = "mongodb"
-version = "2.8.0"
+version = "3.0.0-beta"
 
 exclude = [
     "etc/**",
@@ -85,7 +85,7 @@ once_cell = "1.19.0"
 log = { version = "0.4.17", optional = true }
 md-5 = "0.10.1"
 mongocrypt = { git = "https://github.com/mongodb/libmongocrypt-rust.git", branch = "main", optional = true }
-mongodb-internal-macros = { path = "macros" }
+mongodb-internal-macros = { path = "macros", version = "3.0.0-beta" }
 num_cpus = { version = "1.13.1", optional = true }
 openssl = { version = "0.10.38", optional = true }
 openssl-probe = { version = "0.1.5", optional = true }

README.md

@@ -18,7 +18,7 @@ The driver tests against Linux, MacOS, and Windows in CI.
 The driver is available on [crates.io](https://crates.io/crates/mongodb). To use the driver in your application, simply add it to your project's `Cargo.toml`.
 ```toml
 [dependencies]
-mongodb = "2.8.0"
+mongodb = "3.0.0-beta"
 ```
 
 Version 1 of this crate has reached end of life and will no longer be receiving any updates or bug fixes, so all users are recommended to always depend on the latest 2.x release. See the [2.0.0 release notes](https://github.com/mongodb/mongo-rust-driver/releases/tag/v2.0.0) for migration information if upgrading from a 1.x version.
@@ -27,7 +27,7 @@ Version 1 of this crate has reached end of life and will no longer be receiving
 The driver also provides a blocking sync API. To enable this, add the `"sync"` feature to your `Cargo.toml`:
 ```toml
 [dependencies.mongodb]
-version = "2.8.0"
+version = "3.0.0-beta"
 features = ["sync"]
 ```
 **Note:** The sync-specific types can be imported from `mongodb::sync` (e.g. `mongodb::sync::Client`).

etc/update_version/src/main.rs

@@ -85,6 +85,10 @@ fn main() {
             "Cargo.toml",
             r#"name = "mongodb"\nversion = "(?<target>.*?)"\n"#,
         ),
+        Location::new(
+            "Cargo.toml",
+            r#"mongodb-internal-macros = \{ path = "macros", version = "(?<target>.*?)" \}\n"#,
+        ),
         Location::new(
             "macros/Cargo.toml",
             r#"name = "mongodb-internal-macros"\nversion = "(?<target>.*?)"\n"#,
@@ -99,10 +103,6 @@ fn main() {
             r#"html_root_url = "https://docs.rs/mongodb/(?<target>.*?)""#,
         ),
     ];
-    let quote_version_loc = Location::new(
-        "Cargo.toml",
-        r#"mongodb-internal-macros = (?<target>\{ path = .* \})\n"#,
-    );
     let bson_version_loc = Location::new("Cargo.toml", r#"bson = (?<target>\{ git = .*? \})\n"#);
     let mongocrypt_version_loc =
         Location::new("Cargo.toml", r#"mongocrypt = (?<target>\{ git = .*? \})\n"#);
@@ -113,7 +113,6 @@ fn main() {
     for loc in &version_locs {
         pending.apply(loc, &args.version);
     }
-    pending.apply(&quote_version_loc, &format!("{:?}", args.version));
     if let Some(bson) = args.bson {
         pending.apply(&bson_version_loc, &format!("{:?}", bson));
     }

macros/Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "mongodb-internal-macros"
-version = "2.8.0"
+description = "Internal macros for the mongodb crate"
+version = "3.0.0-beta"
 edition = "2021"
 license = "Apache-2.0"
 

src/lib.rs

@@ -12,7 +12,7 @@
 )]
 #![cfg_attr(docsrs, feature(doc_auto_cfg))]
 #![cfg_attr(test, type_length_limit = "80000000")]
-#![doc(html_root_url = "https://docs.rs/mongodb/2.8.0")]
+#![doc(html_root_url = "https://docs.rs/mongodb/3.0.0-beta")]
 
 #[macro_use]
 pub mod options;