Update wasmtime, Rust, and rules_rust

Signed-off-by: Keith Mattix II <[email protected]>
proxy-wasm · Aug 6, 2024 · a55a2d8 · a55a2d8
1 parent adb9e42
commit a55a2d8
Show file tree

Hide file tree

Showing 141 changed files with 2,119 additions and 5,145 deletions.
diff --git a/bazel/cargo/wasmtime/Cargo.Bazel.lock b/bazel/cargo/wasmtime/Cargo.Bazel.lock
diff --git a/bazel/cargo/wasmtime/Cargo.toml b/bazel/cargo/wasmtime/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 edition = "2021"
 name = "wasmtime-c-api-bazel"
-version = "9.0.3"
+version = "23.0.1"
 rust-version = "1.66.0"
 
 [lib]
@@ -11,5 +11,5 @@ path = "fake_lib.rs"
 env_logger = "0.10"
 anyhow = "1.0"
 once_cell = "1.12"
-wasmtime = {version = "9.0.3", default-features = false, features = ['cranelift']}
-wasmtime-c-api-macros = {git = "https://github.com/bytecodealliance/wasmtime", tag = "v9.0.3"}
+wasmtime = {version = "23.0.1", default-features = false, features = ['cranelift']}
+wasmtime-c-api-macros = {git = "https://github.com/bytecodealliance/wasmtime", tag = "v23.0.1"}
diff --git a/bazel/cargo/wasmtime/remote/BUILD.ahash-0.8.11.bazel b/bazel/cargo/wasmtime/remote/BUILD.ahash-0.8.11.bazel
@@ -11,17 +11,18 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
-# licenses([
-#     "TODO",  # MIT OR Apache-2.0
-# ])
-
 rust_library(
     name = "ahash",
-    srcs = glob(["**/*.rs"]),
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     compile_data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -30,7 +31,9 @@ rust_library(
     ),
     crate_root = "src/lib.rs",
     edition = "2018",
-    rustc_flags = ["--cap-lints=allow"],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
     tags = [
         "cargo-bazel",
         "crate-name=ahash",
@@ -65,6 +68,12 @@ rust_library(
         "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
             "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
         ],
+        "@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
+            "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
+        ],
+        "@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
+            "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
+        ],
         "@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
             "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
         ],
@@ -101,12 +110,6 @@ rust_library(
         "@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
             "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
         ],
-        "@rules_rust//rust/platform:thumbv7em-none-eabi": [
-            "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
-        ],
-        "@rules_rust//rust/platform:thumbv8m.main-none-eabi": [
-            "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
-        ],
         "@rules_rust//rust/platform:wasm32-unknown-unknown": [
             "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
         ],
@@ -134,6 +137,9 @@ rust_library(
         "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
             "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
         ],
+        "@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [
+            "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
+        ],
         "@rules_rust//rust/platform:x86_64-unknown-none": [
             "@cu__once_cell-1.19.0//:once_cell",  # cfg(not(all(target_arch = "arm", target_os = "none")))
         ],
@@ -142,14 +148,19 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "ahash_build_script",
-    srcs = glob(["**/*.rs"]),
+    name = "ahash_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     crate_name = "build_script_build",
     crate_root = "build.rs",
     data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -176,6 +187,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = "ahash_build_script",
+    actual = ":ahash_bs",
     tags = ["manual"],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.aho-corasick-1.1.3.bazel b/bazel/cargo/wasmtime/remote/BUILD.aho-corasick-1.1.3.bazel
@@ -10,17 +10,18 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
-# licenses([
-#     "TODO",  # Unlicense OR MIT
-# ])
-
 rust_library(
     name = "aho_corasick",
-    srcs = glob(["**/*.rs"]),
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     compile_data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -33,7 +34,9 @@ rust_library(
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
-    rustc_flags = ["--cap-lints=allow"],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
     tags = [
         "cargo-bazel",
         "crate-name=aho-corasick",

diff --git a/bazel/cargo/wasmtime/remote/BUILD.anyhow-1.0.86.bazel b/bazel/cargo/wasmtime/remote/BUILD.anyhow-1.0.86.bazel
@@ -11,17 +11,18 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
-# licenses([
-#     "TODO",  # MIT OR Apache-2.0
-# ])
-
 rust_library(
     name = "anyhow",
-    srcs = glob(["**/*.rs"]),
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     compile_data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -34,7 +35,9 @@ rust_library(
     ],
     crate_root = "src/lib.rs",
     edition = "2018",
-    rustc_flags = ["--cap-lints=allow"],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
     tags = [
         "cargo-bazel",
         "crate-name=anyhow",
@@ -49,8 +52,11 @@ rust_library(
 )
 
 cargo_build_script(
-    name = "anyhow_build_script",
-    srcs = glob(["**/*.rs"]),
+    name = "anyhow_bs",
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     crate_features = [
         "default",
         "std",
@@ -59,8 +65,10 @@ cargo_build_script(
     crate_root = "build.rs",
     data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -84,6 +92,6 @@ cargo_build_script(
 
 alias(
     name = "build_script_build",
-    actual = "anyhow_build_script",
+    actual = ":anyhow_bs",
     tags = ["manual"],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.arbitrary-1.3.2.bazel b/bazel/cargo/wasmtime/remote/BUILD.arbitrary-1.3.2.bazel
@@ -10,17 +10,18 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
-# licenses([
-#     "TODO",  # MIT OR Apache-2.0
-# ])
-
 rust_library(
     name = "arbitrary",
-    srcs = glob(["**/*.rs"]),
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     compile_data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -29,7 +30,9 @@ rust_library(
     ),
     crate_root = "src/lib.rs",
     edition = "2021",
-    rustc_flags = ["--cap-lints=allow"],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
     tags = [
         "cargo-bazel",
         "crate-name=arbitrary",

diff --git a/bazel/cargo/wasmtime/remote/BUILD.bazel b/bazel/cargo/wasmtime/remote/BUILD.bazel
@@ -13,15 +13,21 @@ exports_files(
         "cargo-bazel.json",
         "crates.bzl",
         "defs.bzl",
-    ] + glob(["*.bazel"]),
+    ] + glob(
+        include = ["*.bazel"],
+        allow_empty = True,
+    ),
 )
 
 filegroup(
     name = "srcs",
-    srcs = glob([
-        "*.bazel",
-        "*.bzl",
-    ]),
+    srcs = glob(
+        include = [
+            "*.bazel",
+            "*.bzl",
+        ],
+        allow_empty = True,
+    ),
 )
 
 # Workspace Member Dependencies
@@ -45,12 +51,12 @@ alias(
 
 alias(
     name = "wasmtime",
-    actual = "@cu__wasmtime-9.0.4//:wasmtime",
+    actual = "@cu__wasmtime-23.0.1//:wasmtime",
     tags = ["manual"],
 )
 
 alias(
     name = "wasmtime-c-api-macros",
-    actual = "@cu__wasmtime-c-api-macros-0.0.0//:wasmtime_c_api_macros",
+    actual = "@cu__wasmtime-c-api-macros-23.0.1//:wasmtime_c_api_macros",
     tags = ["manual"],
 )
diff --git a/bazel/cargo/wasmtime/remote/BUILD.bitflags-2.6.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.bitflags-2.6.0.bazel
@@ -10,29 +10,29 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
-# licenses([
-#     "TODO",  # MIT OR Apache-2.0
-# ])
-
 rust_library(
     name = "bitflags",
-    srcs = glob(["**/*.rs"]),
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     compile_data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
             "WORKSPACE.bazel",
         ],
     ),
-    crate_features = [
-        "std",
-    ],
     crate_root = "src/lib.rs",
     edition = "2021",
-    rustc_flags = ["--cap-lints=allow"],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
     tags = [
         "cargo-bazel",
         "crate-name=bitflags",

diff --git a/bazel/cargo/wasmtime/remote/BUILD.bumpalo-3.16.0.bazel b/bazel/cargo/wasmtime/remote/BUILD.bumpalo-3.16.0.bazel
@@ -10,17 +10,18 @@ load("@rules_rust//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
-# licenses([
-#     "TODO",  # MIT OR Apache-2.0
-# ])
-
 rust_library(
     name = "bumpalo",
-    srcs = glob(["**/*.rs"]),
+    srcs = glob(
+        include = ["**/*.rs"],
+        allow_empty = False,
+    ),
     compile_data = glob(
         include = ["**"],
+        allow_empty = True,
         exclude = [
             "**/* *",
+            ".tmp_git_root/**/*",
             "BUILD",
             "BUILD.bazel",
             "WORKSPACE",
@@ -32,7 +33,9 @@ rust_library(
     ],
     crate_root = "src/lib.rs",
     edition = "2021",
-    rustc_flags = ["--cap-lints=allow"],
+    rustc_flags = [
+        "--cap-lints=allow",
+    ],
     tags = [
         "cargo-bazel",
         "crate-name=bumpalo",