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.

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

Update rules_rust to latest. #76

Merged
merged 1 commit into from
Feb 5, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .bazelrc
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
# Force Bazel to use --target=wasm32-wasi
build --platforms=@io_bazel_rules_rust//rust/platform:wasi
build --platforms=@rules_rust//rust/platform:wasi
4 changes: 2 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,10 +60,10 @@ jobs:
key: ${{ hashFiles('WORKSPACE', '.bazelrc', '.bazelversion', 'bazel/cargo/Cargo.raze.lock', 'bazel/dependencies.bzl', 'bazel/repositories.bzl') }}

- name: Build (wasm32-unknown-unknown)
run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasm //...
run: bazelisk --bazelrc=/dev/null build --platforms=@rules_rust//rust/platform:wasm //...

- name: Build (wasm32-wasi)
run: bazelisk --bazelrc=/dev/null build --platforms=@io_bazel_rules_rust//rust/platform:wasi //...
run: bazelisk --bazelrc=/dev/null build --platforms=@rules_rust//rust/platform:wasi //...

- name: Format (buildifier)
run: |
Expand Down
2 changes: 1 addition & 1 deletion BUILD
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@io_bazel_rules_rust//rust:rust.bzl", "rust_library")
load("@rules_rust//rust:rust.bzl", "rust_library")

rust_library(
name = "proxy_wasm",
Expand Down
1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ opt-level = 3
panic = "abort"

[package.metadata.raze]
rust_rules_workspace_name = "rules_rust"
package_aliases_dir = "bazel/cargo"
workspace_path = "//bazel/cargo"
genmode = "Remote"
Expand Down
2 changes: 1 addition & 1 deletion bazel/cargo/remote/BUILD.ahash-0.4.7.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down
2 changes: 1 addition & 1 deletion bazel/cargo/remote/BUILD.autocfg-1.0.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down
2 changes: 1 addition & 1 deletion bazel/cargo/remote/BUILD.cfg-if-1.0.0.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down
8 changes: 4 additions & 4 deletions bazel/cargo/remote/BUILD.chrono-0.4.19.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down Expand Up @@ -69,15 +69,15 @@ rust_library(
] + selects.with_or({
# cfg(all(target_arch = "wasm32", not(any(target_os = "emscripten", target_os = "wasi"))))
(
"@io_bazel_rules_rust//rust/platform:wasm32-unknown-unknown",
"@rules_rust//rust/platform:wasm32-unknown-unknown",
): [
],
"//conditions:default": [],
}) + selects.with_or({
# cfg(windows)
(
"@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
"@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
"@rules_rust//rust/platform:i686-pc-windows-msvc",
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
"@raze__winapi__0_3_9//:winapi",
],
Expand Down
76 changes: 38 additions & 38 deletions bazel/cargo/remote/BUILD.getrandom-0.2.2.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand All @@ -58,36 +58,36 @@ cargo_build_script(
] + selects.with_or({
# cfg(all(target_arch = "wasm32", target_os = "unknown"))
(
"@io_bazel_rules_rust//rust/platform:wasm32-unknown-unknown",
"@rules_rust//rust/platform:wasm32-unknown-unknown",
): [
],
"//conditions:default": [],
}) + selects.with_or({
# cfg(target_os = "wasi")
(
"@io_bazel_rules_rust//rust/platform:wasm32-wasi",
"@rules_rust//rust/platform:wasm32-wasi",
): [
],
"//conditions:default": [],
}) + selects.with_or({
# cfg(unix)
(
"@io_bazel_rules_rust//rust/platform:aarch64-apple-darwin",
"@io_bazel_rules_rust//rust/platform:aarch64-apple-ios",
"@io_bazel_rules_rust//rust/platform:aarch64-linux-android",
"@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:arm-unknown-linux-gnueabi",
"@io_bazel_rules_rust//rust/platform:i686-apple-darwin",
"@io_bazel_rules_rust//rust/platform:i686-linux-android",
"@io_bazel_rules_rust//rust/platform:i686-unknown-freebsd",
"@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:powerpc-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:s390x-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin",
"@io_bazel_rules_rust//rust/platform:x86_64-apple-ios",
"@io_bazel_rules_rust//rust/platform:x86_64-linux-android",
"@io_bazel_rules_rust//rust/platform:x86_64-unknown-freebsd",
"@io_bazel_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-apple-darwin",
"@rules_rust//rust/platform:i686-linux-android",
"@rules_rust//rust/platform:i686-unknown-freebsd",
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
"@rules_rust//rust/platform:s390x-unknown-linux-gnu",
"@rules_rust//rust/platform:x86_64-apple-darwin",
"@rules_rust//rust/platform:x86_64-apple-ios",
"@rules_rust//rust/platform:x86_64-linux-android",
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
],
"//conditions:default": [],
Expand Down Expand Up @@ -122,37 +122,37 @@ rust_library(
] + selects.with_or({
# cfg(all(target_arch = "wasm32", target_os = "unknown"))
(
"@io_bazel_rules_rust//rust/platform:wasm32-unknown-unknown",
"@rules_rust//rust/platform:wasm32-unknown-unknown",
): [
],
"//conditions:default": [],
}) + selects.with_or({
# cfg(target_os = "wasi")
(
"@io_bazel_rules_rust//rust/platform:wasm32-wasi",
"@rules_rust//rust/platform:wasm32-wasi",
): [
"@raze__wasi__0_10_2_wasi_snapshot_preview1//:wasi",
],
"//conditions:default": [],
}) + selects.with_or({
# cfg(unix)
(
"@io_bazel_rules_rust//rust/platform:aarch64-apple-darwin",
"@io_bazel_rules_rust//rust/platform:aarch64-apple-ios",
"@io_bazel_rules_rust//rust/platform:aarch64-linux-android",
"@io_bazel_rules_rust//rust/platform:aarch64-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:arm-unknown-linux-gnueabi",
"@io_bazel_rules_rust//rust/platform:i686-apple-darwin",
"@io_bazel_rules_rust//rust/platform:i686-linux-android",
"@io_bazel_rules_rust//rust/platform:i686-unknown-freebsd",
"@io_bazel_rules_rust//rust/platform:i686-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:powerpc-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:s390x-unknown-linux-gnu",
"@io_bazel_rules_rust//rust/platform:x86_64-apple-darwin",
"@io_bazel_rules_rust//rust/platform:x86_64-apple-ios",
"@io_bazel_rules_rust//rust/platform:x86_64-linux-android",
"@io_bazel_rules_rust//rust/platform:x86_64-unknown-freebsd",
"@io_bazel_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-apple-darwin",
"@rules_rust//rust/platform:i686-linux-android",
"@rules_rust//rust/platform:i686-unknown-freebsd",
"@rules_rust//rust/platform:i686-unknown-linux-gnu",
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
"@rules_rust//rust/platform:s390x-unknown-linux-gnu",
"@rules_rust//rust/platform:x86_64-apple-darwin",
"@rules_rust//rust/platform:x86_64-apple-ios",
"@rules_rust//rust/platform:x86_64-linux-android",
"@rules_rust//rust/platform:x86_64-unknown-freebsd",
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
): [
"@raze__libc__0_2_85//:libc",
],
Expand Down
2 changes: 1 addition & 1 deletion bazel/cargo/remote/BUILD.hashbrown-0.9.1.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down
4 changes: 2 additions & 2 deletions bazel/cargo/remote/BUILD.libc-0.2.85.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/cargo/remote/BUILD.log-0.4.14.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/cargo/remote/BUILD.num-integer-0.1.44.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
4 changes: 2 additions & 2 deletions bazel/cargo/remote/BUILD.num-traits-0.2.14.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
6 changes: 3 additions & 3 deletions bazel/cargo/remote/BUILD.time-0.1.43.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down Expand Up @@ -55,8 +55,8 @@ rust_library(
] + selects.with_or({
# cfg(windows)
(
"@io_bazel_rules_rust//rust/platform:i686-pc-windows-msvc",
"@io_bazel_rules_rust//rust/platform:x86_64-pc-windows-msvc",
"@rules_rust//rust/platform:i686-pc-windows-msvc",
"@rules_rust//rust/platform:x86_64-pc-windows-msvc",
): [
"@raze__winapi__0_3_9//:winapi",
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand Down
4 changes: 2 additions & 2 deletions bazel/cargo/remote/BUILD.winapi-0.3.9.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ DO NOT EDIT! Replaced on runs of cargo-raze

# buildifier: disable=load
load(
"@io_bazel_rules_rust//rust:rust.bzl",
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_library",
"rust_test",
Expand All @@ -31,7 +31,7 @@ licenses([
# Generated Targets
# buildifier: disable=load-on-top
load(
"@io_bazel_rules_rust//cargo:cargo_build_script.bzl",
"@rules_rust//cargo:cargo_build_script.bzl",
"cargo_build_script",
)

Expand Down
2 changes: 1 addition & 1 deletion bazel/dependencies.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.

load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
load("@proxy_wasm_rust_sdk//bazel/cargo:crates.bzl", "raze_fetch_remote_crates")
load("@rules_rust//rust:repositories.bzl", "rust_repositories")

def proxy_wasm_rust_sdk_dependencies():
rust_repositories()
Expand Down
Loading