Skip to content

Commit 332de50

Browse files
committed
Auto merge of #149022 - RalfJung:miri, r=RalfJung
miri subtree update Contains the fix for #4698, which we should get shipped ASAP. Subtree update of `miri` to 0fea24a. Created using https://github.com/rust-lang/josh-sync. r? `@ghost`
2 parents f2823bf + 0fea24a commit 332de50

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+2540
-1199
lines changed

Cargo.lock

Lines changed: 333 additions & 379 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ features = ['unprefixed_malloc_on_supported_platforms']
4040
libc = "0.2"
4141
# native-lib dependencies
4242
libffi = { version = "5.0.0", optional = true }
43-
libloading = { version = "0.8", optional = true }
43+
libloading = { version = "0.9", optional = true }
4444
serde = { version = "1.0.219", features = ["derive"], optional = true }
4545

4646
[target.'cfg(target_os = "linux")'.dependencies]
@@ -72,7 +72,7 @@ harness = false
7272
default = ["stack-cache", "native-lib"]
7373
genmc = ["dep:genmc-sys"]
7474
stack-cache = []
75-
stack-cache-consistency-check = ["stack-cache"]
75+
expensive-consistency-checks = ["stack-cache"]
7676
tracing = ["serde_json"]
7777
native-lib = ["dep:libffi", "dep:libloading", "dep:capstone", "dep:ipc-channel", "dep:nix", "dep:serde"]
7878

0 commit comments

Comments
 (0)