replace mach with mach2

Cargo.toml

@@ -114,6 +114,9 @@ tracing-subscriber = { version = "0.3", default-features = false, features = [
     "fmt",
 ] }
 
+[patch.crates-io]
+region = { git = "https://github.com/wasmerio/region-rs", branch = "3.0.0-patch-mach2" }
+
 [features]
 # Don't add the compiler features in default, please add them on the Makefile
 # since we might want to autoconfigure them depending on the availability on the host.

lib/vm/Cargo.toml

@@ -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"
 
 [target.'cfg(target_os = "windows")'.dependencies]
 winapi = { version = "0.3", features = ["winbase", "memoryapi", "errhandlingapi"] }

lib/vm/src/trap/traphandlers.rs

@@ -172,12 +172,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(

lib/wasi-web/Cargo.toml

@@ -138,6 +138,9 @@ wasm-bindgen-test = "^0.3"
 [build-dependencies]
 build-deps = "^0.1"
 
+[patch.crates-io]
+region = { git = "https://github.com/wasmerio/region-rs", branch = "3.0.0-patch-mach2" }
+
 [lib]
 crate-type = ["cdylib"]