Skip to content

Commit

Permalink
Merge branch 'main' into releng_v0.2.2
Browse files Browse the repository at this point in the history
  • Loading branch information
PiotrSikora authored Jul 21, 2024
2 parents 96b4a30 + 44c5a3c commit 8bbbe6a
Show file tree
Hide file tree
Showing 31 changed files with 1,113 additions and 144 deletions.
2 changes: 1 addition & 1 deletion .bazelversion
Original file line number Diff line number Diff line change
@@ -1 +1 @@
7.0.2
7.2.1
2 changes: 2 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -238,6 +238,7 @@ jobs:
- 'http_body'
- 'http_config'
- 'http_headers'
- 'grpc_auth_random'

defaults:
run:
Expand Down Expand Up @@ -301,6 +302,7 @@ jobs:
- 'http_body'
- 'http_config'
- 'http_headers'
- 'grpc_auth_random'

defaults:
run:
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
- [HTTP Headers](./examples/http_headers/)
- [HTTP Response body](./examples/http_body/)
- [HTTP Configuration](./examples/http_config/)
- [gRPC Auth (random)](./examples/grpc_auth_random/)

## Articles & blog posts from the community

Expand All @@ -32,5 +33,5 @@
When updating dependencies, you need to regenerate Bazel `BUILD` files to match updated `Cargo.toml`:

```sh
bazel run //bazel/cargo:crates_vendor -- --repin
bazel run //bazel/cargo:crates_vendor -- --repin all
```
76 changes: 66 additions & 10 deletions bazel/cargo/Cargo.Bazel.lock
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,21 @@ version = 3

[[package]]
name = "ahash"
version = "0.8.3"
version = "0.8.11"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
dependencies = [
"cfg-if",
"once_cell",
"version_check",
"zerocopy",
]

[[package]]
name = "allocator-api2"
version = "0.2.14"
version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c4f263788a35611fba42eb41ff811c5d0360c58b97402570312a350736e2542e"
checksum = "5c6cb57a04249c6480766f7f7cef5467412af1490f8d1e243141daddada3264f"

[[package]]
name = "cfg-if"
Expand All @@ -27,25 +28,34 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

[[package]]
name = "hashbrown"
version = "0.14.0"
version = "0.14.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2c6201b9ff9fd90a5a3bac2e56a830d0caa509576f0e503818ee82c181b3437a"
checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
dependencies = [
"ahash",
"allocator-api2",
]

[[package]]
name = "log"
version = "0.4.18"
version = "0.4.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "518ef76f2f87365916b142844c16d8fefd85039bc5699050210a7778ee1cd1de"
checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"

[[package]]
name = "once_cell"
version = "1.18.0"
version = "1.19.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"
checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"

[[package]]
name = "proc-macro2"
version = "1.0.86"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
dependencies = [
"unicode-ident",
]

[[package]]
name = "proxy-wasm"
Expand All @@ -55,8 +65,54 @@ dependencies = [
"log",
]

[[package]]
name = "quote"
version = "1.0.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
dependencies = [
"proc-macro2",
]

[[package]]
name = "syn"
version = "2.0.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
dependencies = [
"proc-macro2",
"quote",
"unicode-ident",
]

[[package]]
name = "unicode-ident"
version = "1.0.12"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

[[package]]
name = "version_check"
version = "0.9.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

[[package]]
name = "zerocopy"
version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
dependencies = [
"zerocopy-derive",
]

[[package]]
name = "zerocopy-derive"
version = "0.7.35"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@ 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 = True,
),
compile_data = glob(
include = ["**"],
allow_empty = True,
exclude = [
"**/* *",
".tmp_git_root/**/*",
Expand Down Expand Up @@ -78,118 +78,123 @@ rust_library(
"@rules_rust//rust/platform:x86_64-unknown-none": [],
"//conditions:default": ["@platforms//:incompatible"],
}),
version = "0.8.3",
version = "0.8.11",
deps = [
"@crates_vendor__ahash-0.8.3//:build_script_build",
"@crates_vendor__ahash-0.8.11//:build_script_build",
"@crates_vendor__cfg-if-1.0.0//:cfg_if",
"@crates_vendor__zerocopy-0.7.35//:zerocopy",
] + select({
"@rules_rust//rust/platform:aarch64-apple-darwin": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-apple-ios": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-fuchsia": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-linux-android": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:armv7-linux-androideabi": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:i686-apple-darwin": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:i686-linux-android": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:i686-pc-windows-msvc": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:i686-unknown-freebsd": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:i686-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:powerpc-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:riscv32imc-unknown-none-elf": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:riscv64gc-unknown-none-elf": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:s390x-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:wasm32-unknown-unknown": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:wasm32-wasi": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-apple-darwin": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-apple-ios": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-fuchsia": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-linux-android": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__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": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"@rules_rust//rust/platform:x86_64-unknown-none": [
"@crates_vendor__once_cell-1.18.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
"@crates_vendor__once_cell-1.19.0//:once_cell", # cfg(not(all(target_arch = "arm", target_os = "none")))
],
"//conditions:default": [],
}),
)

cargo_build_script(
name = "ahash_build_script",
srcs = glob(["**/*.rs"]),
name = "_bs",
srcs = glob(
include = ["**/*.rs"],
allow_empty = True,
),
crate_name = "build_script_build",
crate_root = "build.rs",
data = glob(
include = ["**"],
allow_empty = True,
exclude = [
"**/* *",
".tmp_git_root/**/*",
Expand All @@ -200,6 +205,7 @@ cargo_build_script(
],
),
edition = "2018",
pkg_name = "ahash",
rustc_flags = [
"--cap-lints=allow",
],
Expand All @@ -210,7 +216,7 @@ cargo_build_script(
"noclippy",
"norustfmt",
],
version = "0.8.3",
version = "0.8.11",
visibility = ["//visibility:private"],
deps = [
"@crates_vendor__version_check-0.9.4//:version_check",
Expand All @@ -219,6 +225,6 @@ cargo_build_script(

alias(
name = "build_script_build",
actual = ":ahash_build_script",
actual = ":_bs",
tags = ["manual"],
)
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,15 @@ load("@rules_rust//rust:defs.bzl", "rust_library")

package(default_visibility = ["//visibility:public"])

# licenses([
# "TODO", # MIT OR Apache-2.0
# ])

rust_library(
name = "allocator_api2",
srcs = glob(["**/*.rs"]),
srcs = glob(
include = ["**/*.rs"],
allow_empty = True,
),
compile_data = glob(
include = ["**"],
allow_empty = True,
exclude = [
"**/* *",
".tmp_git_root/**/*",
Expand Down Expand Up @@ -80,5 +80,5 @@ rust_library(
"@rules_rust//rust/platform:x86_64-unknown-none": [],
"//conditions:default": ["@platforms//:incompatible"],
}),
version = "0.2.14",
version = "0.2.18",
)
Loading

0 comments on commit 8bbbe6a

Please sign in to comment.