Skip to content

Commit b86faeb

Browse files
authored
Merge pull request #33648 from teskje/remove-protobuf
*: remove more unused protobuf/proptest boilerplate
2 parents b56825e + 671fd5a commit b86faeb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

54 files changed

+144
-2396
lines changed

Cargo.lock

Lines changed: 4 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/dyncfg/BUILD.bazel

Lines changed: 4 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# by the Apache License, Version 2.0.
1111

1212
load("@crates_io//:defs.bzl", "aliases", "all_crate_deps")
13-
load("@rules_rust//cargo:defs.bzl", "cargo_build_script", "extract_cargo_lints")
13+
load("@rules_rust//cargo:defs.bzl", "extract_cargo_lints")
1414
load("@rules_rust//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
1515

1616
package(default_visibility = ["//visibility:public"])
@@ -30,11 +30,7 @@ rust_library(
3030
rustc_env = {},
3131
rustc_flags = [],
3232
version = "0.0.0",
33-
deps = [
34-
":mz_dyncfg_build_script",
35-
"//src/ore:mz_ore",
36-
"//src/proto:mz_proto",
37-
] + all_crate_deps(normal = True),
33+
deps = ["//src/ore:mz_ore"] + all_crate_deps(normal = True),
3834
)
3935

4036
alias(
@@ -64,10 +60,7 @@ rust_test(
6460
rustc_env = {},
6561
rustc_flags = [],
6662
version = "0.0.0",
67-
deps = [
68-
"//src/ore:mz_ore",
69-
"//src/proto:mz_proto",
70-
] + all_crate_deps(
63+
deps = ["//src/ore:mz_ore"] + all_crate_deps(
7164
normal = True,
7265
normal_dev = True,
7366
),
@@ -76,35 +69,12 @@ rust_test(
7669
rust_doc_test(
7770
name = "mz_dyncfg_doc_test",
7871
crate = ":mz_dyncfg",
79-
deps = [
80-
"//src/ore:mz_ore",
81-
"//src/proto:mz_proto",
82-
] + all_crate_deps(
72+
deps = ["//src/ore:mz_ore"] + all_crate_deps(
8373
normal = True,
8474
normal_dev = True,
8575
),
8676
)
8777

88-
filegroup(
89-
name = "all_protos",
90-
srcs = [
91-
"src/dyncfg.proto",
92-
"//src/proto:all_protos",
93-
],
94-
)
95-
96-
cargo_build_script(
97-
name = "mz_dyncfg_build_script",
98-
srcs = ["build.rs"],
99-
build_script_env = {},
100-
compile_data = [],
101-
data = [":all_protos"],
102-
proc_macro_deps = [] + all_crate_deps(build_proc_macro = True),
103-
rustc_env = {},
104-
rustc_flags = [],
105-
deps = ["//src/build-tools:mz_build_tools"] + all_crate_deps(build = True),
106-
)
107-
10878
extract_cargo_lints(
10979
name = "lints",
11080
manifest = "Cargo.toml",

src/dyncfg/Cargo.toml

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,21 +13,13 @@ workspace = true
1313
[dependencies]
1414
humantime = "2.2.0"
1515
mz-ore = { path = "../ore", default-features = false, features = ["proptest", "test"] }
16-
mz-proto = { path = "../proto", default-features = false }
17-
proptest = { version = "1.7.0", default-features = false, features = ["std"] }
18-
proptest-derive = { version = "0.5.1", features = ["boxed_union"] }
19-
prost = { version = "0.13.5", features = ["no-recursion-limit"] }
2016
serde = { version = "1.0.219", features = ["derive", "rc"] }
2117
serde_json = "1.0.127"
2218
tracing = "0.1.37"
2319
workspace-hack = { version = "0.0.0", path = "../workspace-hack", optional = true }
2420

25-
[build-dependencies]
26-
mz-build-tools = { path = "../build-tools", default-features = false, features = ["protobuf-src"] }
27-
prost-build = "0.13.5"
28-
2921
[features]
30-
default = ["mz-build-tools/default", "workspace-hack"]
22+
default = ["workspace-hack"]
3123

3224
[package.metadata.cargo-udeps.ignore]
3325
normal = ["workspace-hack"]

src/dyncfg/build.rs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/dyncfg/src/dyncfg.proto

Lines changed: 0 additions & 50 deletions
This file was deleted.

0 commit comments

Comments
 (0)