Skip to content

Commit a554f4d

Browse files
committedAug 5, 2024·
Auto merge of #3789 - RalfJung:deps, r=RalfJung
bump dependencies In particular pick up RalfJung/rustc-build-sysroot#22 to fix the fallout from #128534.
·
1.88.01.82.0
2 parents d1ad05a + 014fdb5 commit a554f4d

File tree

5 files changed

+300
-310
lines changed

5 files changed

+300
-310
lines changed
 

‎src/tools/miri/Cargo.lock

Lines changed: 134 additions & 102 deletions
Large diffs are not rendered by default.

‎src/tools/miri/cargo-miri/Cargo.lock

Lines changed: 88 additions & 65 deletions
Original file line numberDiff line numberDiff line change

‎src/tools/miri/cargo-miri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ directories = "5"
1818
rustc_version = "0.4"
1919
serde_json = "1.0.40"
2020
cargo_metadata = "0.18.0"
21-
rustc-build-sysroot = "0.5.2"
21+
rustc-build-sysroot = "0.5.3"
2222

2323
# Enable some feature flags that dev-dependencies need but dependencies
2424
# do not. This makes `./miri install` after `./miri build` faster.

‎src/tools/miri/test_dependencies/Cargo.lock

Lines changed: 76 additions & 141 deletions
Original file line numberDiff line numberDiff line change

‎src/tools/miri/tests/fail-dep/tokio/sleep.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ error: unsupported operation: returning ready events from epoll_wait is not yet
22
--> CARGO_REGISTRY/.../epoll.rs:LL:CC
33
|
44
LL | / syscall!(epoll_wait(
5-
LL | | self.ep,
5+
LL | | self.ep.as_raw_fd(),
66
LL | | events.as_mut_ptr(),
77
LL | | events.capacity() as i32,
88
LL | | timeout,

0 commit comments

Comments
 (0)
Please sign in to comment.