diff --git a/Cargo.lock b/Cargo.lock index e3cc4bca6d..6cbae05a71 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -118,7 +118,6 @@ dependencies = [ name = "compile_state" version = "0.1.0" dependencies = [ - "bridge_types", "slvm", ] @@ -443,7 +442,6 @@ dependencies = [ name = "sl-compiler" version = "0.1.0" dependencies = [ - "bridge_types", "builtins", "chrono", "compile_state", @@ -498,7 +496,6 @@ dependencies = [ name = "slvm" version = "0.1.0" dependencies = [ - "bridge_types", "unicode-segmentation", ] diff --git a/bridge_macros/Cargo.toml b/bridge_macros/Cargo.toml index be208c29d3..933a565987 100644 --- a/bridge_macros/Cargo.toml +++ b/bridge_macros/Cargo.toml @@ -12,5 +12,7 @@ syn = { version = "1.0.95", features = ["full"] } quote = "1.0.18" static_assertions = "1.1.0" bridge_types = { workspace = true } -trybuild = "1.0.85" slvm = { path = "../vm" } + +[dev-dependencies] +trybuild = "1.0.85" diff --git a/compile_state/Cargo.toml b/compile_state/Cargo.toml index 851a5f9d2d..a01182643a 100644 --- a/compile_state/Cargo.toml +++ b/compile_state/Cargo.toml @@ -7,4 +7,3 @@ edition = "2021" [dependencies] slvm = { path = "../vm" } -bridge_types = { workspace = true } diff --git a/compiler/Cargo.toml b/compiler/Cargo.toml index 246c1f8863..5dd8beef81 100644 --- a/compiler/Cargo.toml +++ b/compiler/Cargo.toml @@ -11,7 +11,6 @@ unicode_reader = "1" slvm = { path = "../vm" } builtins = { path = "../builtins" } compile_state = { path = "../compile_state" } -bridge_types = { workspace = true } [build-dependencies] chrono = "0.4" diff --git a/shell/src/platform/unix.rs b/shell/src/platform/unix.rs index 0073213323..ad480dfc47 100644 --- a/shell/src/platform/unix.rs +++ b/shell/src/platform/unix.rs @@ -25,9 +25,9 @@ use nix::unistd::{self, Uid}; mod umask; // macos does not define __rlimit_resource_t... -#[cfg(target_os = "macos")] +#[cfg(not(any(target_env = "gnu", target_env = "uclibc")))] pub type RlimitResource = nix::libc::c_int; -#[cfg(not(target_os = "macos"))] +#[cfg(any(target_env = "gnu", target_env = "uclibc"))] pub type RlimitResource = nix::libc::__rlimit_resource_t; pub struct Sys {} diff --git a/vm/Cargo.toml b/vm/Cargo.toml index 3396b40e3b..030d77bd89 100644 --- a/vm/Cargo.toml +++ b/vm/Cargo.toml @@ -12,4 +12,3 @@ nohelmet = [] [dependencies] unicode-segmentation = "1.10.1" -bridge_types = { workspace = true }