Skip to content

Commit f94e749

Browse files
PiotrSikoraPiotrSikora
committed
Update rules_rust to v0.61.0 (with Rust v1.86.0).
Signed-off-by: Piotr Sikora <[email protected]>
1 parent 57d9f95 commit f94e749

9 files changed

+103
-27
lines changed

‎.bazelrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Disable Bzlmod
22
common --noenable_bzlmod
33

4-
# Force Bazel to use --target=wasm32-wasi
4+
# Force Bazel to use --target=wasm32-wasip1
55
build --platforms=@rules_rust//rust/platform:wasi

‎bazel/cargo/remote/BUILD.allocator-api2-0.2.21.bazel‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
# bazel run @//bazel/cargo:crates_vendor
77
###############################################################################
88

9+
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
910
load("@rules_rust//rust:defs.bzl", "rust_library")
1011

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

14+
cargo_toml_env_vars(
15+
name = "cargo_toml_env_vars",
16+
src = "Cargo.toml",
17+
)
18+
1319
rust_library(
1420
name = "allocator_api2",
1521
srcs = glob(
@@ -33,6 +39,9 @@ rust_library(
3339
],
3440
crate_root = "src/lib.rs",
3541
edition = "2018",
42+
rustc_env_files = [
43+
":cargo_toml_env_vars",
44+
],
3645
rustc_flags = [
3746
"--cap-lints=allow",
3847
],
@@ -47,12 +56,13 @@ rust_library(
4756
"@rules_rust//rust/platform:aarch64-apple-darwin": [],
4857
"@rules_rust//rust/platform:aarch64-apple-ios": [],
4958
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
50-
"@rules_rust//rust/platform:aarch64-fuchsia": [],
5159
"@rules_rust//rust/platform:aarch64-linux-android": [],
5260
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
61+
"@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
5362
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
5463
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
5564
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
65+
"@rules_rust//rust/platform:aarch64-unknown-uefi": [],
5666
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
5767
"@rules_rust//rust/platform:armv7-linux-androideabi": [],
5868
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
@@ -68,16 +78,17 @@ rust_library(
6878
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
6979
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
7080
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
71-
"@rules_rust//rust/platform:wasm32-wasi": [],
81+
"@rules_rust//rust/platform:wasm32-wasip1": [],
7282
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
7383
"@rules_rust//rust/platform:x86_64-apple-ios": [],
74-
"@rules_rust//rust/platform:x86_64-fuchsia": [],
7584
"@rules_rust//rust/platform:x86_64-linux-android": [],
7685
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
7786
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
87+
"@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
7888
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
7989
"@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
8090
"@rules_rust//rust/platform:x86_64-unknown-none": [],
91+
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
8192
"//conditions:default": ["@platforms//:incompatible"],
8293
}),
8394
version = "0.2.21",

‎bazel/cargo/remote/BUILD.bazel‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,18 +31,36 @@ filegroup(
3131
)
3232

3333
# Workspace Member Dependencies
34+
alias(
35+
name = "hashbrown-0.15.3",
36+
actual = "@crates_vendor__hashbrown-0.15.3//:hashbrown",
37+
tags = ["manual"],
38+
)
39+
3440
alias(
3541
name = "hashbrown",
3642
actual = "@crates_vendor__hashbrown-0.15.3//:hashbrown",
3743
tags = ["manual"],
3844
)
3945

46+
alias(
47+
name = "log-0.4.27",
48+
actual = "@crates_vendor__log-0.4.27//:log",
49+
tags = ["manual"],
50+
)
51+
4052
alias(
4153
name = "log",
4254
actual = "@crates_vendor__log-0.4.27//:log",
4355
tags = ["manual"],
4456
)
4557

58+
alias(
59+
name = "proxy-wasm-0.2.3-dev",
60+
actual = "@crates_vendor__proxy-wasm-0.2.3-dev//:proxy_wasm",
61+
tags = ["manual"],
62+
)
63+
4664
alias(
4765
name = "proxy-wasm",
4866
actual = "@crates_vendor__proxy-wasm-0.2.3-dev//:proxy_wasm",

‎bazel/cargo/remote/BUILD.equivalent-1.0.2.bazel‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
# bazel run @//bazel/cargo:crates_vendor
77
###############################################################################
88

9+
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
910
load("@rules_rust//rust:defs.bzl", "rust_library")
1011

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

14+
cargo_toml_env_vars(
15+
name = "cargo_toml_env_vars",
16+
src = "Cargo.toml",
17+
)
18+
1319
rust_library(
1420
name = "equivalent",
1521
srcs = glob(
@@ -30,6 +36,9 @@ rust_library(
3036
),
3137
crate_root = "src/lib.rs",
3238
edition = "2015",
39+
rustc_env_files = [
40+
":cargo_toml_env_vars",
41+
],
3342
rustc_flags = [
3443
"--cap-lints=allow",
3544
],
@@ -44,12 +53,13 @@ rust_library(
4453
"@rules_rust//rust/platform:aarch64-apple-darwin": [],
4554
"@rules_rust//rust/platform:aarch64-apple-ios": [],
4655
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
47-
"@rules_rust//rust/platform:aarch64-fuchsia": [],
4856
"@rules_rust//rust/platform:aarch64-linux-android": [],
4957
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
58+
"@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
5059
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
5160
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
5261
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
62+
"@rules_rust//rust/platform:aarch64-unknown-uefi": [],
5363
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
5464
"@rules_rust//rust/platform:armv7-linux-androideabi": [],
5565
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
@@ -65,16 +75,17 @@ rust_library(
6575
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
6676
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
6777
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
68-
"@rules_rust//rust/platform:wasm32-wasi": [],
78+
"@rules_rust//rust/platform:wasm32-wasip1": [],
6979
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
7080
"@rules_rust//rust/platform:x86_64-apple-ios": [],
71-
"@rules_rust//rust/platform:x86_64-fuchsia": [],
7281
"@rules_rust//rust/platform:x86_64-linux-android": [],
7382
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
7483
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
84+
"@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
7585
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
7686
"@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
7787
"@rules_rust//rust/platform:x86_64-unknown-none": [],
88+
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
7889
"//conditions:default": ["@platforms//:incompatible"],
7990
}),
8091
version = "1.0.2",

‎bazel/cargo/remote/BUILD.foldhash-0.1.5.bazel‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
# bazel run @//bazel/cargo:crates_vendor
77
###############################################################################
88

9+
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
910
load("@rules_rust//rust:defs.bzl", "rust_library")
1011

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

14+
cargo_toml_env_vars(
15+
name = "cargo_toml_env_vars",
16+
src = "Cargo.toml",
17+
)
18+
1319
rust_library(
1420
name = "foldhash",
1521
srcs = glob(
@@ -30,6 +36,9 @@ rust_library(
3036
),
3137
crate_root = "src/lib.rs",
3238
edition = "2021",
39+
rustc_env_files = [
40+
":cargo_toml_env_vars",
41+
],
3342
rustc_flags = [
3443
"--cap-lints=allow",
3544
],
@@ -44,12 +53,13 @@ rust_library(
4453
"@rules_rust//rust/platform:aarch64-apple-darwin": [],
4554
"@rules_rust//rust/platform:aarch64-apple-ios": [],
4655
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
47-
"@rules_rust//rust/platform:aarch64-fuchsia": [],
4856
"@rules_rust//rust/platform:aarch64-linux-android": [],
4957
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
58+
"@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
5059
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
5160
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
5261
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
62+
"@rules_rust//rust/platform:aarch64-unknown-uefi": [],
5363
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
5464
"@rules_rust//rust/platform:armv7-linux-androideabi": [],
5565
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
@@ -65,16 +75,17 @@ rust_library(
6575
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
6676
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
6777
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
68-
"@rules_rust//rust/platform:wasm32-wasi": [],
78+
"@rules_rust//rust/platform:wasm32-wasip1": [],
6979
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
7080
"@rules_rust//rust/platform:x86_64-apple-ios": [],
71-
"@rules_rust//rust/platform:x86_64-fuchsia": [],
7281
"@rules_rust//rust/platform:x86_64-linux-android": [],
7382
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
7483
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
84+
"@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
7585
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
7686
"@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
7787
"@rules_rust//rust/platform:x86_64-unknown-none": [],
88+
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
7889
"//conditions:default": ["@platforms//:incompatible"],
7990
}),
8091
version = "0.1.5",

‎bazel/cargo/remote/BUILD.hashbrown-0.15.3.bazel‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
# bazel run @//bazel/cargo:crates_vendor
77
###############################################################################
88

9+
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
910
load("@rules_rust//rust:defs.bzl", "rust_library")
1011

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

14+
cargo_toml_env_vars(
15+
name = "cargo_toml_env_vars",
16+
src = "Cargo.toml",
17+
)
18+
1319
rust_library(
1420
name = "hashbrown",
1521
srcs = glob(
@@ -38,6 +44,9 @@ rust_library(
3844
],
3945
crate_root = "src/lib.rs",
4046
edition = "2021",
47+
rustc_env_files = [
48+
":cargo_toml_env_vars",
49+
],
4150
rustc_flags = [
4251
"--cap-lints=allow",
4352
],
@@ -52,12 +61,13 @@ rust_library(
5261
"@rules_rust//rust/platform:aarch64-apple-darwin": [],
5362
"@rules_rust//rust/platform:aarch64-apple-ios": [],
5463
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
55-
"@rules_rust//rust/platform:aarch64-fuchsia": [],
5664
"@rules_rust//rust/platform:aarch64-linux-android": [],
5765
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
66+
"@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
5867
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
5968
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
6069
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
70+
"@rules_rust//rust/platform:aarch64-unknown-uefi": [],
6171
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
6272
"@rules_rust//rust/platform:armv7-linux-androideabi": [],
6373
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
@@ -73,16 +83,17 @@ rust_library(
7383
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
7484
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
7585
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
76-
"@rules_rust//rust/platform:wasm32-wasi": [],
86+
"@rules_rust//rust/platform:wasm32-wasip1": [],
7787
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
7888
"@rules_rust//rust/platform:x86_64-apple-ios": [],
79-
"@rules_rust//rust/platform:x86_64-fuchsia": [],
8089
"@rules_rust//rust/platform:x86_64-linux-android": [],
8190
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
8291
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
92+
"@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
8393
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
8494
"@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
8595
"@rules_rust//rust/platform:x86_64-unknown-none": [],
96+
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
8697
"//conditions:default": ["@platforms//:incompatible"],
8798
}),
8899
version = "0.15.3",

‎bazel/cargo/remote/BUILD.log-0.4.27.bazel‎

Lines changed: 14 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,16 @@
66
# bazel run @//bazel/cargo:crates_vendor
77
###############################################################################
88

9+
load("@rules_rust//cargo:defs.bzl", "cargo_toml_env_vars")
910
load("@rules_rust//rust:defs.bzl", "rust_library")
1011

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

14+
cargo_toml_env_vars(
15+
name = "cargo_toml_env_vars",
16+
src = "Cargo.toml",
17+
)
18+
1319
rust_library(
1420
name = "log",
1521
srcs = glob(
@@ -30,6 +36,9 @@ rust_library(
3036
),
3137
crate_root = "src/lib.rs",
3238
edition = "2021",
39+
rustc_env_files = [
40+
":cargo_toml_env_vars",
41+
],
3342
rustc_flags = [
3443
"--cap-lints=allow",
3544
],
@@ -44,12 +53,13 @@ rust_library(
4453
"@rules_rust//rust/platform:aarch64-apple-darwin": [],
4554
"@rules_rust//rust/platform:aarch64-apple-ios": [],
4655
"@rules_rust//rust/platform:aarch64-apple-ios-sim": [],
47-
"@rules_rust//rust/platform:aarch64-fuchsia": [],
4856
"@rules_rust//rust/platform:aarch64-linux-android": [],
4957
"@rules_rust//rust/platform:aarch64-pc-windows-msvc": [],
58+
"@rules_rust//rust/platform:aarch64-unknown-fuchsia": [],
5059
"@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [],
5160
"@rules_rust//rust/platform:aarch64-unknown-nixos-gnu": [],
5261
"@rules_rust//rust/platform:aarch64-unknown-nto-qnx710": [],
62+
"@rules_rust//rust/platform:aarch64-unknown-uefi": [],
5363
"@rules_rust//rust/platform:arm-unknown-linux-gnueabi": [],
5464
"@rules_rust//rust/platform:armv7-linux-androideabi": [],
5565
"@rules_rust//rust/platform:armv7-unknown-linux-gnueabi": [],
@@ -65,16 +75,17 @@ rust_library(
6575
"@rules_rust//rust/platform:thumbv7em-none-eabi": [],
6676
"@rules_rust//rust/platform:thumbv8m.main-none-eabi": [],
6777
"@rules_rust//rust/platform:wasm32-unknown-unknown": [],
68-
"@rules_rust//rust/platform:wasm32-wasi": [],
78+
"@rules_rust//rust/platform:wasm32-wasip1": [],
6979
"@rules_rust//rust/platform:x86_64-apple-darwin": [],
7080
"@rules_rust//rust/platform:x86_64-apple-ios": [],
71-
"@rules_rust//rust/platform:x86_64-fuchsia": [],
7281
"@rules_rust//rust/platform:x86_64-linux-android": [],
7382
"@rules_rust//rust/platform:x86_64-pc-windows-msvc": [],
7483
"@rules_rust//rust/platform:x86_64-unknown-freebsd": [],
84+
"@rules_rust//rust/platform:x86_64-unknown-fuchsia": [],
7585
"@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [],
7686
"@rules_rust//rust/platform:x86_64-unknown-nixos-gnu": [],
7787
"@rules_rust//rust/platform:x86_64-unknown-none": [],
88+
"@rules_rust//rust/platform:x86_64-unknown-uefi": [],
7889
"//conditions:default": ["@platforms//:incompatible"],
7990
}),
8091
version = "0.4.27",

‎bazel/cargo/remote/defs.bzl‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -295,8 +295,8 @@ def aliases(
295295
_NORMAL_DEPENDENCIES = {
296296
"": {
297297
_COMMON_CONDITION: {
298-
"hashbrown": Label("@crates_vendor__hashbrown-0.15.3//:hashbrown"),
299-
"log": Label("@crates_vendor__log-0.4.27//:log"),
298+
"hashbrown": Label("@crates_vendor//:hashbrown-0.15.3"),
299+
"log": Label("@crates_vendor//:log-0.4.27"),
300300
},
301301
},
302302
}
@@ -362,12 +362,13 @@ _CONDITIONS = {
362362
"aarch64-apple-darwin": ["@rules_rust//rust/platform:aarch64-apple-darwin"],
363363
"aarch64-apple-ios": ["@rules_rust//rust/platform:aarch64-apple-ios"],
364364
"aarch64-apple-ios-sim": ["@rules_rust//rust/platform:aarch64-apple-ios-sim"],
365-
"aarch64-fuchsia": ["@rules_rust//rust/platform:aarch64-fuchsia"],
366365
"aarch64-linux-android": ["@rules_rust//rust/platform:aarch64-linux-android"],
367366
"aarch64-pc-windows-msvc": ["@rules_rust//rust/platform:aarch64-pc-windows-msvc"],
367+
"aarch64-unknown-fuchsia": ["@rules_rust//rust/platform:aarch64-unknown-fuchsia"],
368368
"aarch64-unknown-linux-gnu": ["@rules_rust//rust/platform:aarch64-unknown-linux-gnu"],
369369
"aarch64-unknown-nixos-gnu": ["@rules_rust//rust/platform:aarch64-unknown-nixos-gnu"],
370370
"aarch64-unknown-nto-qnx710": ["@rules_rust//rust/platform:aarch64-unknown-nto-qnx710"],
371+
"aarch64-unknown-uefi": ["@rules_rust//rust/platform:aarch64-unknown-uefi"],
371372
"arm-unknown-linux-gnueabi": ["@rules_rust//rust/platform:arm-unknown-linux-gnueabi"],
372373
"armv7-linux-androideabi": ["@rules_rust//rust/platform:armv7-linux-androideabi"],
373374
"armv7-unknown-linux-gnueabi": ["@rules_rust//rust/platform:armv7-unknown-linux-gnueabi"],
@@ -383,16 +384,17 @@ _CONDITIONS = {
383384
"thumbv7em-none-eabi": ["@rules_rust//rust/platform:thumbv7em-none-eabi"],
384385
"thumbv8m.main-none-eabi": ["@rules_rust//rust/platform:thumbv8m.main-none-eabi"],
385386
"wasm32-unknown-unknown": ["@rules_rust//rust/platform:wasm32-unknown-unknown"],
386-
"wasm32-wasi": ["@rules_rust//rust/platform:wasm32-wasi"],
387+
"wasm32-wasip1": ["@rules_rust//rust/platform:wasm32-wasip1"],
387388
"x86_64-apple-darwin": ["@rules_rust//rust/platform:x86_64-apple-darwin"],
388389
"x86_64-apple-ios": ["@rules_rust//rust/platform:x86_64-apple-ios"],
389-
"x86_64-fuchsia": ["@rules_rust//rust/platform:x86_64-fuchsia"],
390390
"x86_64-linux-android": ["@rules_rust//rust/platform:x86_64-linux-android"],
391391
"x86_64-pc-windows-msvc": ["@rules_rust//rust/platform:x86_64-pc-windows-msvc"],
392392
"x86_64-unknown-freebsd": ["@rules_rust//rust/platform:x86_64-unknown-freebsd"],
393+
"x86_64-unknown-fuchsia": ["@rules_rust//rust/platform:x86_64-unknown-fuchsia"],
393394
"x86_64-unknown-linux-gnu": ["@rules_rust//rust/platform:x86_64-unknown-linux-gnu"],
394395
"x86_64-unknown-nixos-gnu": ["@rules_rust//rust/platform:x86_64-unknown-nixos-gnu"],
395396
"x86_64-unknown-none": ["@rules_rust//rust/platform:x86_64-unknown-none"],
397+
"x86_64-unknown-uefi": ["@rules_rust//rust/platform:x86_64-unknown-uefi"],
396398
}
397399

398400
###############################################################################

0 commit comments

Comments
 (0)