Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

replace mach with mach2 #4250

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

replace mach with mach2 #4250

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
13 changes: 6 additions & 7 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Cargo.toml
View file
Open in desktop
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion lib/vm/Cargo.toml
View file
Open in desktop
Expand Up @@ -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"] }
Expand Down
12 changes: 6 additions & 6 deletions lib/vm/src/trap/traphandlers.rs
View file
Open in desktop
Expand Up @@ -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(
Expand Down
13 changes: 6 additions & 7 deletions lib/wasi-web/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions lib/wasi-web/Cargo.toml
View file
Open in desktop
Expand Up @@ -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"]

Expand Down