From b55fd93cab57ebb70ddfe2687d65e4347c82ce44 Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Tue, 24 Nov 2020 20:10:16 +1000 Subject: [PATCH] manual tag on rslib was preventing clippy lints --- .bazelrc | 2 +- rslib/BUILD.bazel | 11 ++++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/.bazelrc b/.bazelrc index 9ba7bbb55..4f9c63927 100644 --- a/.bazelrc +++ b/.bazelrc @@ -14,7 +14,7 @@ build:windows --build_python_zip=false build --workspace_status_command='bash ./scripts/status.sh' # run clippy when compiling rust in test mode -test --aspects=@io_bazel_rules_rust//rust:rust.bzl%rust_clippy_aspect --output_groups=clippy_checks +test --aspects=@io_bazel_rules_rust//rust:rust.bzl%rust_clippy_aspect --output_groups=+clippy_checks # print output when test fails test --test_output=errors diff --git a/rslib/BUILD.bazel b/rslib/BUILD.bazel index ac8edf1ee..c41321752 100644 --- a/rslib/BUILD.bazel +++ b/rslib/BUILD.bazel @@ -35,7 +35,7 @@ cargo_build_script( # Library ####################### -_anki_deps = glob([ +_anki_data = glob([ "src/**/*.sql", "src/**/*.html", "src/**/*.css", @@ -43,9 +43,7 @@ _anki_deps = glob([ ]) + [ "Cargo.toml", # prevents a warning about num_enum "//:buildinfo.txt", - "templates/.empty", # required for askama, - # ":mergeftl", - # ":protobuf_gen", + "templates/.empty", # required for askama ] _anki_features = [ @@ -58,12 +56,11 @@ rust_library( "src/**/*.rs", ]), crate_features = _anki_features, - data = _anki_deps, + data = _anki_data, proc_macro_deps = [ "//rslib/cargo:serde_derive", "//rslib/cargo:serde_repr", ], - tags = ["manual"], visibility = ["//visibility:public"], deps = [ ":build_script", @@ -120,7 +117,7 @@ rust_test( name = "unit_tests", crate = ":anki", crate_features = _anki_features, - data = _anki_deps + glob([ + data = _anki_data + glob([ "tests/support/**", ]), deps = ["//rslib/cargo:env_logger"],