diff --git a/Cargo.lock b/Cargo.lock index 25d1d94b0d1..c2246308855 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2866,15 +2866,6 @@ dependencies = [ "winapi 0.3.9", ] -[[package]] -name = "mach" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa" -dependencies = [ - "libc", -] - [[package]] name = "mach2" version = "0.4.2" @@ -7002,7 +6993,7 @@ dependencies = [ "indexmap 1.9.3", "lazy_static", "libc", - "mach", + "mach2", "memoffset 0.9.1", "more-asserts", "region", diff --git a/lib/vm/Cargo.toml b/lib/vm/Cargo.toml index 2a715b2de41..6d0e6f0740c 100644 --- a/lib/vm/Cargo.toml +++ b/lib/vm/Cargo.toml @@ -25,7 +25,7 @@ serde = { version = "1.0", features = ["derive", "rc"], optional = true } enum-iterator = "0.7.0" scopeguard = "1.1.0" lazy_static = "1.4.0" -region = { version = "3.0" } +region = { version = "3.0.2" } corosensei = { version = "0.1.2" } derivative = { version = "^2" } dashmap = { version = "5.4" } @@ -35,7 +35,7 @@ tracing = { version = "0.1", optional = true } crossbeam-queue = "0.3.8" [target.'cfg(target_vendor = "apple")'.dependencies] -mach = "0.3.2" +mach2 = "0.4.2" [target.'cfg(target_os = "windows")'.dependencies] winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi"] } diff --git a/lib/vm/src/trap/traphandlers.rs b/lib/vm/src/trap/traphandlers.rs index 498d1cb0fc8..aa40a0df6b8 100644 --- a/lib/vm/src/trap/traphandlers.rs +++ b/lib/vm/src/trap/traphandlers.rs @@ -190,12 +190,12 @@ cfg_if::cfg_if! { // For more details see https://github.com/mono/mono/commit/8e75f5a28e6537e56ad70bf870b86e22539c2fb7 #[cfg(target_vendor = "apple")] { - use mach::exception_types::*; - use mach::kern_return::*; - use mach::port::*; - use mach::thread_status::*; - use mach::traps::*; - use mach::mach_types::*; + use mach2::exception_types::*; + use mach2::kern_return::*; + use mach2::port::*; + use mach2::thread_status::*; + use mach2::traps::*; + use mach2::mach_types::*; extern "C" { fn task_set_exception_ports(