Revert "Fix conflicting dependencies"

This reverts commit 12b7819.

Author: RiverPhillips

bazel/cargo/wasmtime/remote/BUILD.wasmtime-jit-1.0.1.bazel

@@ -67,6 +67,19 @@ rust_library(
         "@wasmtime__wasmtime_environ__1_0_1//:wasmtime_environ",
         "@wasmtime__wasmtime_runtime__1_0_1//:wasmtime_runtime",
     ] + selects.with_or({
+        # cfg(target_os = "linux")
+        (
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
+            "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
+            "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
+            "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
+            "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
+        ): [
+            "@wasmtime__rustix__0_35_10//:rustix",
+        ],
+        "//conditions:default": [],
+    }) + selects.with_or({
         # cfg(target_os = "windows")
         (
             "@rules_rust//rust/platform:i686-pc-windows-msvc",

bazel/cargo/wasmtime/remote/BUILD.wasmtime-runtime-1.0.1.bazel

@@ -156,5 +156,28 @@ rust_library(
             "@wasmtime__windows_sys__0_36_1//:windows_sys",
         ],
         "//conditions:default": [],
+    }) + selects.with_or({
+        # cfg(unix)
+        (
+            "@rules_rust//rust/platform:i686-apple-darwin",
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-darwin",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
+            "@rules_rust//rust/platform:aarch64-apple-darwin",
+            "@rules_rust//rust/platform:aarch64-apple-ios",
+            "@rules_rust//rust/platform:aarch64-linux-android",
+            "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
+            "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
+            "@rules_rust//rust/platform:i686-linux-android",
+            "@rules_rust//rust/platform:i686-unknown-freebsd",
+            "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
+            "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-ios",
+            "@rules_rust//rust/platform:x86_64-linux-android",
+            "@rules_rust//rust/platform:x86_64-unknown-freebsd",
+        ): [
+            "@wasmtime__rustix__0_35_10//:rustix",
+        ],
+        "//conditions:default": [],
     }),
 )