diff options
| author | Geoffry Song <goffrie@gmail.com> | 2023-09-28 10:33:39 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-09-28 10:33:39 -0700 |
| commit | ac5aa1edc653d50d97eac26692b6919b9c6dc1b8 (patch) | |
| tree | 7f0b6ec0b6ae9f681dae0494c3fb1a46b293c809 | |
| parent | 4a5d7a1eb3570d3da9c5d66e55e8c6f680fce9d4 (diff) | |
| download | bazelbuild-rules_rust-ac5aa1edc653d50d97eac26692b6919b9c6dc1b8.tar.gz | |
rustdoc: respect error_format config (#2166)
This makes it easier to make a test ensuring rustdoc doesn't emit
warnings.
---------
Co-authored-by: UebelAndre <github@uebelandre.com>
| -rw-r--r-- | rust/private/rustdoc.bzl | 3 | ||||
| -rw-r--r-- | test/unit/rustdoc/rustdoc_unit_test.bzl | 21 |
2 files changed, 24 insertions, 0 deletions
diff --git a/rust/private/rustdoc.bzl b/rust/private/rustdoc.bzl index aa2634d9..f7d9985e 100644 --- a/rust/private/rustdoc.bzl +++ b/rust/private/rustdoc.bzl @@ -321,6 +321,9 @@ rust_doc = rule( cfg = "exec", executable = True, ), + "_error_format": attr.label( + default = Label("//:error_format"), + ), "_process_wrapper": attr.label( doc = "A process wrapper for running rustdoc on all platforms", default = Label("@rules_rust//util/process_wrapper"), diff --git a/test/unit/rustdoc/rustdoc_unit_test.bzl b/test/unit/rustdoc/rustdoc_unit_test.bzl index b4221399..a02fdf51 100644 --- a/test/unit/rustdoc/rustdoc_unit_test.bzl +++ b/test/unit/rustdoc/rustdoc_unit_test.bzl @@ -111,6 +111,18 @@ def _rustdoc_zip_output_test_impl(ctx): return analysistest.end(env) +def _rustdoc_with_json_error_format_test_impl(ctx): + env = analysistest.begin(ctx) + tut = analysistest.target_under_test(env) + + _common_rustdoc_checks(env, tut) + + action = _get_rustdoc_action(env, tut) + + assert_argv_contains(env, action, "--error-format=json") + + return analysistest.end(env) + rustdoc_for_lib_test = analysistest.make(_rustdoc_for_lib_test_impl) rustdoc_for_bin_test = analysistest.make(_rustdoc_for_bin_test_impl) rustdoc_for_proc_macro_test = analysistest.make(_rustdoc_for_proc_macro_test_impl) @@ -119,6 +131,9 @@ rustdoc_for_bin_with_transitive_proc_macro_test = analysistest.make(_rustdoc_for rustdoc_for_lib_with_cc_lib_test = analysistest.make(_rustdoc_for_lib_with_cc_lib_test_impl) rustdoc_with_args_test = analysistest.make(_rustdoc_with_args_test_impl) rustdoc_zip_output_test = analysistest.make(_rustdoc_zip_output_test_impl) +rustdoc_with_json_error_format_test = analysistest.make(_rustdoc_with_json_error_format_test_impl, config_settings = { + "@//:error_format": "json", +}) def _target_maker(rule_fn, name, rustdoc_deps = [], **kwargs): rule_fn( @@ -321,6 +336,11 @@ def rustdoc_test_suite(name): target_under_test = ":rustdoc_with_args", ) + rustdoc_with_json_error_format_test( + name = "rustdoc_with_json_error_format_test", + target_under_test = ":lib_doc", + ) + native.filegroup( name = "lib_doc_zip", srcs = [":lib_doc.zip"], @@ -340,6 +360,7 @@ def rustdoc_test_suite(name): ":rustdoc_for_lib_with_proc_macro_test", ":rustdoc_for_lib_with_cc_lib_test", ":rustdoc_with_args_test", + ":rustdoc_with_json_error_format_test", ":rustdoc_zip_output_test", ], ) |