Skip to content

Commit a4f094a

Browse files
RUST-2173 Check in Cargo.lock file (#1371)
1 parent 9953793 commit a4f094a

File tree

7 files changed

+6269
-17
lines changed

7 files changed

+6269
-17
lines changed

.evergreen/MSRV-Cargo.toml.diff

Lines changed: 0 additions & 13 deletions
This file was deleted.

.evergreen/compile-only.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ set -o xtrace
55

66
source ./.evergreen/env.sh
77

8-
# Install the MSRV and pin dependencies who have bumped their MSRVs to > ours in recent releases.
8+
# Install the MSRV and generate a new lockfile with MSRV-compatible dependencies.
99
if [ "$RUST_VERSION" != "" ]; then
1010
rustup toolchain install $RUST_VERSION
1111
TOOLCHAIN="+${RUST_VERSION}"
12-
patch Cargo.toml .evergreen/MSRV-Cargo.toml.diff
12+
CARGO_RESOLVER_INCOMPATIBLE_RUST_VERSIONS=fallback cargo +nightly -Zmsrv-policy generate-lockfile
1313
fi
1414

1515
# Test with default features.

.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
*~
55
/target/
66
**/*.rs.bk
7-
Cargo.lock
87
.idea
98
*.iml
109
.vscode
@@ -14,4 +13,4 @@ Cargo.lock
1413
.rustup
1514
mongocryptd.pid
1615
semgrep/
17-
sarif.json
16+
sarif.json

0 commit comments

Comments
 (0)