Skip to content

Commit

Permalink
Update rules_rust to latest. (envoyproxy#15112)
Browse files Browse the repository at this point in the history
Signed-off-by: Piotr Sikora <[email protected]>
  • Loading branch information
PiotrSikora authored Feb 19, 2021
1 parent b771578 commit 6f1ba43
Show file tree
Hide file tree
Showing 5 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion bazel/dependency_imports.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
load("@build_bazel_rules_apple//apple:repositories.bzl", "apple_rules_dependencies")
load("@rules_fuzzing//fuzzing:repositories.bzl", "oss_fuzz_dependencies", "rules_fuzzing_dependencies")
load("@upb//bazel:workspace_deps.bzl", "upb_deps")
load("@io_bazel_rules_rust//rust:repositories.bzl", "rust_repositories")
load("@rules_rust//rust:repositories.bzl", "rust_repositories")
load("@config_validation_pip3//:requirements.bzl", config_validation_pip_install = "pip_install")
load("@configs_pip3//:requirements.bzl", configs_pip_install = "pip_install")
load("@headersplit_pip3//:requirements.bzl", headersplit_pip_install = "pip_install")
Expand Down
2 changes: 1 addition & 1 deletion bazel/external/wasmtime.BUILD
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@rules_cc//cc:defs.bzl", "cc_library")
load("@io_bazel_rules_rust//rust:rust.bzl", "rust_library")
load("@rules_rust//rust:rust.bzl", "rust_library")

licenses(["notice"]) # Apache 2

Expand Down
2 changes: 1 addition & 1 deletion bazel/repositories.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ def _go_deps(skip_targets):
external_http_archive("bazel_gazelle")

def _rust_deps():
external_http_archive("io_bazel_rules_rust")
external_http_archive("rules_rust")

def envoy_dependencies(skip_targets = []):
# Setup Envoy developer tools.
Expand Down
20 changes: 10 additions & 10 deletions bazel/repository_locations.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -921,8 +921,8 @@ REPOSITORY_LOCATIONS_SPEC = dict(
project_name = "WebAssembly for Proxies (C++ host implementation)",
project_desc = "WebAssembly for Proxies (C++ host implementation)",
project_url = "https://github.com/proxy-wasm/proxy-wasm-cpp-host",
version = "c51fbca35e9e7968fc5319258ed7a38b1bc1ec7a",
sha256 = "533944a9084c2f75c36bda627152b9f31047ff3554b6361a88a542f16dee9483",
version = "d1a2a7db59a72edacc9a6286b64280b72767d2d0",
sha256 = "3e81235c963291bd01f9425ed6e34d6b44ca0adc9f281b0cafc5cba6ad3bcc6d",
strip_prefix = "proxy-wasm-cpp-host-{version}",
urls = ["https://github.com/proxy-wasm/proxy-wasm-cpp-host/archive/{version}.tar.gz"],
use_category = ["dataplane_ext"],
Expand All @@ -937,19 +937,19 @@ REPOSITORY_LOCATIONS_SPEC = dict(
"envoy.wasm.runtime.wavm",
"envoy.wasm.runtime.wasmtime",
],
release_date = "2021-02-11",
release_date = "2021-02-19",
cpe = "N/A",
),
proxy_wasm_rust_sdk = dict(
project_name = "WebAssembly for Proxies (Rust SDK)",
project_desc = "WebAssembly for Proxies (Rust SDK)",
project_url = "https://github.com/proxy-wasm/proxy-wasm-rust-sdk",
version = "802cab2eabc1da106d8b8b7be2c7278b2bfadfbd",
sha256 = "cc247af14ffa903e90d07ae28effeec9ad11215118f5802ab7d22b961cacd365",
version = "28a94df25659b2107b67a11df0112f8f6833558b",
sha256 = "d3da0042fc119282223b7955962e8b3eed261242c8493f9dc8d07a08ca7e2e3e",
strip_prefix = "proxy-wasm-rust-sdk-{version}",
urls = ["https://github.com/proxy-wasm/proxy-wasm-rust-sdk/archive/{version}.tar.gz"],
use_category = ["test_only"],
release_date = "2020-12-05",
release_date = "2021-02-09",
cpe = "N/A",
),
emscripten_toolchain = dict(
Expand All @@ -963,17 +963,17 @@ REPOSITORY_LOCATIONS_SPEC = dict(
use_category = ["build"],
release_date = "2020-10-13",
),
io_bazel_rules_rust = dict(
rules_rust = dict(
project_name = "Bazel rust rules",
project_desc = "Bazel rust rules (used by Wasm)",
project_url = "https://github.com/bazelbuild/rules_rust",
version = "aa7c6938cf1cc2973bc065c7532f89874bf09818",
sha256 = "5cb2fbcc3debebc7b68f5f66c1b7ef741bdcca87c70594de688d4518538c36c8",
version = "fee3b3c658c3d2f49c20c1b12e55063bf7a7f693",
sha256 = "0f55b4b69fd9bc1dbcc038e75ec54bd97fa00ddc6cfbc6278fc288dafc98b7f8",
strip_prefix = "rules_rust-{version}",
urls = ["https://github.com/bazelbuild/rules_rust/archive/{version}.tar.gz"],
use_category = ["dataplane_ext"],
extensions = ["envoy.wasm.runtime.wasmtime"],
release_date = "2020-12-04",
release_date = "2021-02-18",
cpe = "N/A",
),
rules_antlr = dict(
Expand Down
4 changes: 2 additions & 2 deletions bazel/wasm/wasm.bzl
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
load("@io_bazel_rules_rust//rust:rust.bzl", "rust_binary")
load("@proxy_wasm_cpp_sdk//bazel/wasm:wasm.bzl", "wasm_cc_binary")
load("@rules_rust//rust:rust.bzl", "rust_binary")

def _wasm_rust_transition_impl(settings, attr):
return {
"//command_line_option:platforms": "@io_bazel_rules_rust//rust/platform:wasm",
"//command_line_option:platforms": "@rules_rust//rust/platform:wasm",
}

wasm_rust_transition = transition(
Expand Down

0 comments on commit 6f1ba43

Please sign in to comment.