Support rustfmt on crates with generated sources

bazelbuild · Nov 11, 2023 · 3d12662 · 3d12662
1 parent 54bef51
commit 3d12662
Show file tree

Hide file tree

Showing 4 changed files with 45 additions and 0 deletions.
diff --git a/test/rustfmt/BUILD.bazel b/test/rustfmt/BUILD.bazel
@@ -1,9 +1,21 @@
+load("@bazel_skylib//rules:write_file.bzl", "write_file")
 load(":rustfmt_integration_test_suite.bzl", "rustfmt_integration_test_suite")
 
 exports_files([
     "test_rustfmt.toml",
 ])
 
+write_file(
+    name = "srcs/generated/generated",
+    out = "srcs/generated/generated.rs",
+    content = """\
+pub fn greeting() {
+    println!("Guten tag!");
+}
+""".splitlines(),
+    newline = "unix",
+)
+
 rustfmt_integration_test_suite(
     name = "rustfmt_integration_test_suite",
 )
diff --git a/test/rustfmt/rustfmt_failure_test.sh b/test/rustfmt/rustfmt_failure_test.sh
@@ -69,6 +69,7 @@ EOF
     check_build_result $TEST_FAILED ${variant}_unformatted_2018_test
     check_build_result $TEST_OK ${variant}_formatted_2015_test
     check_build_result $TEST_OK ${variant}_formatted_2018_test
+    check_build_result $TEST_OK ${variant}_generated_test
   done
 
   # Format a specific target
@@ -81,6 +82,7 @@ EOF
     check_build_result $TEST_OK ${variant}_unformatted_2018_test
     check_build_result $TEST_OK ${variant}_formatted_2015_test
     check_build_result $TEST_OK ${variant}_formatted_2018_test
+    check_build_result $TEST_OK ${variant}_generated_test
   done
 
   # Format all targets

diff --git a/test/rustfmt/rustfmt_integration_test_suite.bzl b/test/rustfmt/rustfmt_integration_test_suite.bzl
@@ -29,6 +29,9 @@ def rustfmt_integration_test_suite(name, **kwargs):
 
     tests = []
     for variant, rust_rule in _VARIANTS.items():
+        #
+        # Test edition 2018
+        #
         rust_rule(
             name = "{}_formatted_2018".format(variant),
             srcs = ["srcs/2018/formatted.rs"],
@@ -53,6 +56,9 @@ def rustfmt_integration_test_suite(name, **kwargs):
             targets = [":{}_unformatted_2018".format(variant)],
         )
 
+        #
+        # Test edition 2015
+        #
         rust_rule(
             name = "{}_formatted_2015".format(variant),
             srcs = ["srcs/2015/formatted.rs"],
@@ -77,11 +83,30 @@ def rustfmt_integration_test_suite(name, **kwargs):
             targets = [":{}_unformatted_2015".format(variant)],
         )
 
+        #
+        # Test targets with generated sources
+        #
+        rust_rule(
+            name = "{}_generated".format(variant),
+            srcs = [
+                "srcs/generated/lib.rs",
+                "srcs/generated/generated.rs",
+            ],
+            crate_root = "srcs/generated/lib.rs",
+            edition = "2021",
+        )
+
+        rustfmt_test(
+            name = "{}_generated_test".format(variant),
+            targets = [":{}_generated".format(variant)],
+        )
+
         tests.extend([
             "{}_formatted_2015_test".format(variant),
             "{}_formatted_2018_test".format(variant),
             "{}_unformatted_2015_test".format(variant),
             "{}_unformatted_2018_test".format(variant),
+            "{}_generated_test".format(variant),
         ])
 
     native.test_suite(
@@ -93,4 +118,5 @@ def rustfmt_integration_test_suite(name, **kwargs):
     native.sh_binary(
         name = "{}.test_runner".format(name),
         srcs = ["rustfmt_failure_test.sh"],
+        testonly = True,
     )
diff --git a/test/rustfmt/srcs/generated/lib.rs b/test/rustfmt/srcs/generated/lib.rs
@@ -0,0 +1,5 @@
+mod generated;
+
+pub fn main() {
+    generated::greeting();
+}