Skip to content

Commit 1072ffb

Browse files
committed
Fix warnings
1 parent 970e768 commit 1072ffb

File tree

8 files changed

+29
-27
lines changed

8 files changed

+29
-27
lines changed

test/proc_macro/BUILD.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ load("//rust:defs.bzl", "rust_test")
55
name = "proc_macro_{}_integration_test".format(edition),
66
srcs = ["proc_macro_{}_test.rs".format(edition)],
77
edition = edition,
8-
proc_macro_deps = ["//test/unit/proc_macro:proc_macro_{}".format(edition)],
8+
deps = ["//test/unit/proc_macro:proc_macro_{}".format(edition)],
99
)
1010
for edition in [
1111
"2015",

test/proc_macro/data/BUILD.bazel

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,9 @@ rust_test(
66
name = "proc_macro_data_test",
77
srcs = ["rust_test.rs"],
88
edition = "2021",
9-
proc_macro_deps = [
10-
":rust_proc_macro",
11-
],
129
deps = [
1310
":nonmacro_library",
11+
":rust_proc_macro",
1412
],
1513
)
1614

@@ -19,7 +17,7 @@ rust_library(
1917
name = "nonmacro_library",
2018
srcs = ["nonmacro_library.rs"],
2119
edition = "2021",
22-
proc_macro_deps = [
20+
deps = [
2321
":rust_proc_macro",
2422
],
2523
)

test/rust_analyzer/aspect_traversal_test/BUILD.bazel

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,12 @@ rust_library(
88
":renamed_proc_macro_dep": "shorter_name",
99
},
1010
edition = "2018",
11-
proc_macro_deps = [
12-
":proc_macro_dep",
13-
":renamed_proc_macro_dep",
14-
],
1511
deps = [
1612
":alias_dep",
1713
":custom_alias_dep",
1814
":lib_dep",
15+
":proc_macro_dep",
16+
":renamed_proc_macro_dep",
1917
],
2018
)
2119

@@ -71,8 +69,10 @@ rust_test(
7169
name = "mylib_test",
7270
crate = ":mylib",
7371
edition = "2018",
74-
proc_macro_deps = [":extra_proc_macro_dep"],
75-
deps = [":extra_test_dep"],
72+
deps = [
73+
":extra_test_dep",
74+
":extra_proc_macro_dep"
75+
],
7676
)
7777

7878
rust_library(

test/unit/pipelined_compilation/pipelined_compilation_test.bzl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,8 +99,10 @@ def _pipelined_compilation_test():
9999
name = "second",
100100
edition = "2021",
101101
srcs = ["second.rs"],
102-
deps = [":first"],
103-
proc_macro_deps = [":my_macro"],
102+
deps = [
103+
":first",
104+
":my_macro",
105+
],
104106
)
105107

106108
rust_binary(

test/unit/proc_macro/leaks_deps/proc_macro_does_not_leak_deps.bzl

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,11 +63,9 @@ def _proc_macro_does_not_leak_deps_test():
6363
srcs = ["leaks_deps/proc_macro_user.rs"],
6464
edition = "2018",
6565
deps = [
66-
"//test/unit/proc_macro/leaks_deps/native",
67-
],
68-
proc_macro_deps = [
6966
":proc_macro_definition",
7067
":proc_macro_with_native_dep",
68+
"//test/unit/proc_macro/leaks_deps/native",
7169
],
7270
)
7371

@@ -123,7 +121,7 @@ def _proc_macro_does_not_leak_lib_deps_test():
123121
name = "a",
124122
srcs = ["leaks_deps/lib/a.rs"],
125123
edition = "2018",
126-
proc_macro_deps = [
124+
deps = [
127125
":my_macro",
128126
],
129127
)

test/unit/rustdoc/rustdoc_unit_test.bzl

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -248,15 +248,15 @@ def _define_targets():
248248
name = "lib_with_proc_macro",
249249
srcs = ["rustdoc_lib.rs"],
250250
rustdoc_deps = [":adder"],
251-
proc_macro_deps = [":rustdoc_proc_macro"],
251+
deps = [":rustdoc_proc_macro"],
252252
crate_features = ["with_proc_macro"],
253253
)
254254

255255
_target_maker(
256256
rust_library,
257257
name = "lib_with_proc_macro_in_docs",
258258
srcs = ["procmacro_in_rustdoc.rs"],
259-
proc_macro_deps = [":rustdoc_proc_macro"],
259+
deps = [":rustdoc_proc_macro"],
260260
)
261261

262262
_target_maker(
@@ -270,16 +270,18 @@ def _define_targets():
270270
rust_library,
271271
name = "lib_nodep_with_proc_macro",
272272
srcs = ["rustdoc_nodep_lib.rs"],
273-
proc_macro_deps = [":rustdoc_proc_macro"],
273+
deps = [":rustdoc_proc_macro"],
274274
crate_features = ["with_proc_macro"],
275275
)
276276

277277
_target_maker(
278278
rust_binary,
279279
name = "bin_with_transitive_proc_macro",
280280
srcs = ["rustdoc_bin.rs"],
281-
deps = [":lib_with_proc_macro"],
282-
proc_macro_deps = [":rustdoc_proc_macro"],
281+
deps = [
282+
":lib_with_proc_macro",
283+
":rustdoc_proc_macro",
284+
],
283285
crate_features = ["with_proc_macro"],
284286
)
285287

test/unit/transitive_link_search_paths/transitive_link_search_paths_test.bzl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,10 @@ def _transitive_link_search_paths_test():
5656
name = "dep",
5757
srcs = ["dep.rs"],
5858
edition = "2018",
59-
proc_macro_deps = [":proc_macro"],
60-
deps = [":dep_build_script"],
59+
deps = [
60+
":dep_build_script",
61+
":proc_macro",
62+
],
6163
)
6264

6365
rust_binary(

test/unpretty/BUILD.bazel

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ rust_test(
3232
name = "proc_macro_test",
3333
srcs = ["proc_macro_consumer.rs"],
3434
edition = "2021",
35-
proc_macro_deps = [":proc_macro"],
35+
deps = [":proc_macro"],
3636
)
3737

3838
rust_unpretty(
@@ -59,7 +59,7 @@ rust_library(
5959
name = "proc_macro_lib",
6060
srcs = ["proc_macro_consumer.rs"],
6161
edition = "2021",
62-
proc_macro_deps = [":proc_macro"],
62+
deps = [":proc_macro"],
6363
)
6464

6565
rust_unpretty(
@@ -86,7 +86,7 @@ rust_shared_library(
8686
name = "proc_macro_shared_lib",
8787
srcs = ["proc_macro_consumer.rs"],
8888
edition = "2021",
89-
proc_macro_deps = [":proc_macro"],
89+
deps = [":proc_macro"],
9090
)
9191

9292
rust_unpretty(

0 commit comments

Comments
 (0)