Skip to content

Commit c5da157

Browse files
dtolnaydtolnay
committed
Fill in all the edition attrs to make 'bazel build ...' succeed
1 parent 13310e9 commit c5da157

File tree

45 files changed

+144
-6
lines changed

Some content is hidden

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

45 files changed

+144
-6
lines changed

‎cargo/bootstrap/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ rust_binary(
1414
srcs = [
1515
"bootstrap_installer.rs",
1616
],
17+
edition = "2018",
1718
rustc_env = {
1819
"RULES_RUST_CARGO_BOOTSTRAP_BINARY": "$(rootpath bootstrap_installer.rs)",
1920
},

‎crate_universe/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,7 @@ rust_library(
6666
include = ["src/**"],
6767
exclude = ["src/**/*.rs"],
6868
),
69+
edition = "2018",
6970
proc_macro_deps = all_crate_deps(proc_macro = True),
7071
version = VERSION,
7172
visibility = ["//visibility:public"],
@@ -75,6 +76,7 @@ rust_library(
7576
rust_binary(
7677
name = "cargo_bazel_bin",
7778
srcs = ["src/main.rs"],
79+
edition = "2018",
7880
version = VERSION,
7981
visibility = ["//visibility:public"],
8082
deps = [":cargo_bazel"],

‎crate_universe/tools/cross_installer/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ rust_binary(
1616
":cross",
1717
"@rules_rust//rust/toolchain:current_exec_cargo_files",
1818
],
19+
edition = "2018",
1920
proc_macro_deps = all_crate_deps(proc_macro = True),
2021
rustc_env = {
2122
"CARGO": "$(rootpath @rules_rust//rust/toolchain:current_exec_cargo_files)",

‎crate_universe/tools/urls_generator/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ rust_binary(
2222
compile_data = [
2323
"//crate_universe/private:urls.bzl",
2424
],
25+
edition = "2018",
2526
proc_macro_deps = all_crate_deps(proc_macro = True),
2627
rustc_env = {
2728
"MODULE_ROOT_PATH": "$(rootpath //crate_universe/private:urls.bzl)",

‎examples/WORKSPACE.bazel

+4-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi
1212

1313
rules_rust_dependencies()
1414

15-
rust_register_toolchains(include_rustc_srcs = True)
15+
rust_register_toolchains(
16+
edition = "2018",
17+
include_rustc_srcs = True,
18+
)
1619

1720
load("@rules_rust//bindgen:repositories.bzl", "rust_bindgen_repositories")
1821

‎examples/cargo_manifest_dir/external_crate/WORKSPACE.bazel

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,4 @@ local_repository(
77

88
load("@rules_rust//rust:repositories.bzl", "rust_repositories")
99

10-
rust_repositories()
10+
rust_repositories(edition = "2018")

‎examples/crate_universe/WORKSPACE.bazel

+4-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@ load("@rules_rust//rust:repositories.bzl", "rules_rust_dependencies", "rust_regi
99

1010
rules_rust_dependencies()
1111

12-
rust_register_toolchains(include_rustc_srcs = True)
12+
rust_register_toolchains(
13+
edition = "2018",
14+
include_rustc_srcs = True,
15+
)
1316

1417
load("@rules_rust//crate_universe:repositories.bzl", "crate_universe_dependencies")
1518

‎proto/BUILD.bazel

+5-1
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ toolchain_type(name = "toolchain")
3434
rust_binary(
3535
name = "optional_output_wrapper",
3636
srcs = ["optional_output_wrapper.rs"],
37+
edition = "2018",
3738
visibility = ["//visibility:public"],
3839
)
3940

@@ -43,7 +44,10 @@ toolchain(
4344
toolchain_type = "@rules_rust//proto:toolchain",
4445
)
4546

46-
rust_proto_toolchain(name = "default-proto-toolchain-impl")
47+
rust_proto_toolchain(
48+
name = "default-proto-toolchain-impl",
49+
edition = "2018",
50+
)
4751

4852
bzl_library(
4953
name = "bzl_lib",

‎test/build_env/BUILD.bazel

+5
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,13 @@ rust_test(
1010
name = "conflicting_deps_test",
1111
srcs = ["tests/manifest_dir.rs"],
1212
data = ["src/manifest_dir_file.txt"],
13+
edition = "2018",
1314
)
1415

1516
rust_test(
1617
name = "arbitrary_env_test",
1718
srcs = ["tests/arbitrary_env.rs"],
19+
edition = "2018",
1820
rustc_env = {
1921
"USER_DEFINED_KEY": "USER_DEFINED_VALUE",
2022
},
@@ -24,17 +26,20 @@ rust_test(
2426
# Intentionally uses a mix of -s and _s because those normalisations are part of what is being tested.
2527
name = "cargo_env-vars_test",
2628
srcs = ["tests/cargo.rs"],
29+
edition = "2018",
2730
deps = [":cargo_build_script_env-vars_build_script"],
2831
)
2932

3033
rust_test(
3134
name = "cargo-env-vars-custom-crate-name-test",
3235
srcs = ["tests/custom_crate_name.rs"],
3336
crate_name = "custom_crate_name",
37+
edition = "2018",
3438
deps = [":cargo_build_script_env-vars_build_script"],
3539
)
3640

3741
cargo_build_script(
3842
name = "cargo_build_script_env-vars_build_script",
3943
srcs = ["src/build.rs"],
44+
edition = "2018",
4045
)

‎test/cargo_build_script/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cargo_build_script(
88
name = "tools_exec_build_rs",
99
srcs = ["build.rs"],
1010
build_script_env = {"TOOL": "$(execpath :tool)"},
11+
edition = "2018",
1112
# Add a flag to test that they're exposed to the build script
1213
rustc_flags = ["--verbose"],
1314
tools = [":tool"],
@@ -23,5 +24,6 @@ genrule(
2324
rust_test(
2425
name = "tools_exec",
2526
srcs = ["tools_exec.rs"],
27+
edition = "2018",
2628
deps = [":tools_exec_build_rs"],
2729
)

‎test/chained_direct_deps/BUILD.bazel

+6
Original file line numberDiff line numberDiff line change
@@ -3,17 +3,20 @@ load("//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")
33
rust_library(
44
name = "mod1",
55
srcs = ["mod1.rs"],
6+
edition = "2018",
67
)
78

89
rust_library(
910
name = "mod2",
1011
srcs = ["mod2.rs"],
12+
edition = "2018",
1113
deps = [":mod1"],
1214
)
1315

1416
rust_library(
1517
name = "mod3",
1618
srcs = ["mod3.rs"],
19+
edition = "2018",
1720
deps = [
1821
":mod1",
1922
":mod2",
@@ -23,16 +26,19 @@ rust_library(
2326
rust_test(
2427
name = "mod1_test",
2528
crate = ":mod1",
29+
edition = "2018",
2630
)
2731

2832
rust_test(
2933
name = "mod2_test",
3034
crate = ":mod2",
35+
edition = "2018",
3136
)
3237

3338
rust_test(
3439
name = "mod3_test",
3540
crate = ":mod3",
41+
edition = "2018",
3642
)
3743

3844
rust_doc_test(

‎test/extra_exec_rustc_flags/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ package(default_visibility = ["//test:__subpackages__"])
1414
rust_library(
1515
name = "lib_do_not_build_directly",
1616
srcs = ["lib.rs"],
17+
edition = "2018",
1718
tags = ["manual"],
1819
)
1920

@@ -36,6 +37,7 @@ with_exec_cfg(
3637
rust_library(
3738
name = "lib_no_exec",
3839
srcs = ["lib_no_exec.rs"],
40+
edition = "2018",
3941
)
4042

4143
with_extra_exec_rustc_flags_cfg(

‎test/inline_test_with_deps/dep/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ package(default_visibility = ["//visibility:public"])
55
rust_library(
66
name = "dep",
77
srcs = ["src/lib.rs"],
8+
edition = "2018",
89
)

‎test/inline_test_with_deps/test/BUILD.bazel

+1
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@ rust_library(
1111
rust_test(
1212
name = "inline_test",
1313
crate = ":inline",
14+
edition = "2018",
1415
deps = ["//test/inline_test_with_deps/dep"],
1516
)

‎test/out_dir_in_tests/BUILD.bazel

+4
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,22 @@ load("//rust:defs.bzl", "rust_library", "rust_test", "rust_test_suite")
44
cargo_build_script(
55
name = "build_script",
66
srcs = ["build.rs"],
7+
edition = "2018",
78
)
89

910
rust_library(
1011
name = "demo_lib",
1112
srcs = [
1213
"src/lib.rs",
1314
],
15+
edition = "2018",
1416
deps = [":build_script"],
1517
)
1618

1719
rust_test(
1820
name = "demo_lib_test",
1921
crate = ":demo_lib",
22+
edition = "2018",
2023
)
2124

2225
rust_test_suite(
@@ -26,4 +29,5 @@ rust_test_suite(
2629
# to the underlying rust_test rules. This will make OUT_DIR
2730
# available when compiling integration tests.
2831
crate = ":demo_lib",
32+
edition = "2018",
2933
)

‎test/process_wrapper/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,7 @@ build_test(
153153
rust_binary(
154154
name = "fake_rustc",
155155
srcs = ["fake_rustc.rs"],
156+
edition = "2018",
156157
)
157158

158159
rust_test(
@@ -162,5 +163,6 @@ rust_test(
162163
":fake_rustc",
163164
"//util/process_wrapper",
164165
],
166+
edition = "2018",
165167
deps = ["//tools/runfiles"],
166168
)

‎test/renamed_deps/BUILD.bazel

+6
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,13 @@ load("//rust:defs.bzl", "rust_library", "rust_test")
33
rust_library(
44
name = "mod1",
55
srcs = ["mod1.rs"],
6+
edition = "2018",
67
)
78

89
rust_library(
910
name = "mod2",
1011
srcs = ["mod2.rs"],
12+
edition = "2018",
1113
deps = [":mod1"],
1214
)
1315

@@ -18,6 +20,7 @@ rust_library(
1820
":mod1": "alias_a",
1921
":mod2": "alias_b",
2022
},
23+
edition = "2018",
2124
deps = [
2225
":mod1",
2326
":mod2",
@@ -27,11 +30,13 @@ rust_library(
2730
rust_test(
2831
name = "mod1_test",
2932
crate = ":mod1",
33+
edition = "2018",
3034
)
3135

3236
rust_test(
3337
name = "mod2_test",
3438
crate = ":mod2",
39+
edition = "2018",
3540
)
3641

3742
rust_test(
@@ -41,4 +46,5 @@ rust_test(
4146
":mod2": "alias_b",
4247
},
4348
crate = ":mod3",
49+
edition = "2018",
4450
)

‎test/rust/BUILD.bazel

+2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@ rust_library(
88
"src/greeter.rs",
99
"src/lib.rs",
1010
],
11+
edition = "2018",
1112
)
1213

1314
rust_binary(
1415
name = "hello_world",
1516
srcs = ["src/main.rs"],
17+
edition = "2018",
1618
deps = [":hello_lib"],
1719
)

‎test/rust_analyzer/aspect_traversal_test/BUILD.bazel

+10
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ load(":custom_alias.bzl", "custom_alias")
44
rust_library(
55
name = "mylib",
66
srcs = ["mylib.rs"],
7+
edition = "2018",
78
proc_macro_deps = [":proc_macro_dep"],
89
deps = [
910
":alias_dep",
@@ -15,6 +16,7 @@ rust_library(
1516
rust_library(
1617
name = "lib_dep",
1718
srcs = ["lib_dep.rs"],
19+
edition = "2018",
1820
)
1921

2022
alias(
@@ -25,12 +27,14 @@ alias(
2527
rust_library(
2628
name = "actual_dep",
2729
srcs = ["actual_dep.rs"],
30+
edition = "2018",
2831
deps = [":dep_of_aliased_dep"],
2932
)
3033

3134
rust_library(
3235
name = "dep_of_aliased_dep",
3336
srcs = ["dep_of_aliased_dep.rs"],
37+
edition = "2018",
3438
)
3539

3640
custom_alias(
@@ -41,34 +45,40 @@ custom_alias(
4145
rust_library(
4246
name = "custom_actual_dep",
4347
srcs = ["custom_actual_dep.rs"],
48+
edition = "2018",
4449
deps = [":dep_of_custom_aliased_dep"],
4550
)
4651

4752
rust_library(
4853
name = "dep_of_custom_aliased_dep",
4954
srcs = ["dep_of_custom_aliased_dep.rs"],
55+
edition = "2018",
5056
)
5157

5258
rust_proc_macro(
5359
name = "proc_macro_dep",
5460
srcs = ["proc_macro_dep.rs"],
61+
edition = "2018",
5562
)
5663

5764
rust_test(
5865
name = "mylib_test",
5966
crate = ":mylib",
67+
edition = "2018",
6068
proc_macro_deps = [":extra_proc_macro_dep"],
6169
deps = [":extra_test_dep"],
6270
)
6371

6472
rust_library(
6573
name = "extra_test_dep",
6674
srcs = ["extra_test_dep.rs"],
75+
edition = "2018",
6776
)
6877

6978
rust_proc_macro(
7079
name = "extra_proc_macro_dep",
7180
srcs = ["extra_proc_macro_dep.rs"],
81+
edition = "2018",
7282
)
7383

7484
rust_test(

0 commit comments

Comments
 (0)