Skip to content

Commit fe5ddf3

Browse files
authored
Updated bazel_skylib to 1.1.1 (#957)
1 parent a6f4d69 commit fe5ddf3

File tree

2 files changed

+5
-15
lines changed

2 files changed

+5
-15
lines changed

rust/repositories.bzl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,11 +88,11 @@ def rust_repositories(
8888
maybe(
8989
http_archive,
9090
name = "bazel_skylib",
91-
sha256 = "1c531376ac7e5a180e0237938a2536de0c54d93f5c278634818e0efc952dd56c",
9291
urls = [
93-
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
94-
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.0.3/bazel-skylib-1.0.3.tar.gz",
92+
"https://github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
93+
"https://mirror.bazel.build/github.com/bazelbuild/bazel-skylib/releases/download/1.1.1/bazel-skylib-1.1.1.tar.gz",
9594
],
95+
sha256 = "c6966ec828da198c5d9adbaa94c05e3a1c7f21bd012a0b29ba8ddbccb2c93b0d",
9696
)
9797

9898
for exec_triple, name in DEFAULT_TOOLCHAIN_TRIPLES.items():

test/unit/clippy/clippy_test.bzl

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@ def _find_clippy_action(actions):
1212

1313
def _clippy_aspect_action_has_flag_impl(ctx, flags):
1414
env = analysistest.begin(ctx)
15-
16-
# TODO: Replace with `analysistest.target_under_test(env)` upstream fix
17-
# https://github.com/bazelbuild/bazel-skylib/pull/299
18-
target = env.ctx.attr.target_under_test_with_aspect
15+
target = analysistest.target_under_test(env)
1916

2017
clippy_action = _find_clippy_action(target.actions)
2118

@@ -68,11 +65,7 @@ def _test_clippy_aspect_action_has_warnings_flag_test_impl(ctx):
6865
def make_clippy_aspect_unittest(impl):
6966
return analysistest.make(
7067
impl,
71-
attrs = {
72-
# We can't just use target_under_test because we need to add our own aspect to the attribute.
73-
# See https://github.com/bazelbuild/bazel-skylib/pull/299
74-
"target_under_test_with_aspect": attr.label(aspects = [rust_clippy_aspect], mandatory = True),
75-
},
68+
extra_target_under_test_aspects = [rust_clippy_aspect],
7669
)
7770

7871
binary_clippy_aspect_action_has_warnings_flag_test = make_clippy_aspect_unittest(_binary_clippy_aspect_action_has_warnings_flag_test_impl)
@@ -89,17 +82,14 @@ def clippy_test_suite(name):
8982
binary_clippy_aspect_action_has_warnings_flag_test(
9083
name = "binary_clippy_aspect_action_has_warnings_flag_test",
9184
target_under_test = Label("//test/clippy:ok_binary"),
92-
target_under_test_with_aspect = Label("//test/clippy:ok_binary"),
9385
)
9486
library_clippy_aspect_action_has_warnings_flag_test(
9587
name = "library_clippy_aspect_action_has_warnings_flag_test",
9688
target_under_test = Label("//test/clippy:ok_library"),
97-
target_under_test_with_aspect = Label("//test/clippy:ok_library"),
9889
)
9990
test_clippy_aspect_action_has_warnings_flag_test(
10091
name = "test_clippy_aspect_action_has_warnings_flag_test",
10192
target_under_test = Label("//test/clippy:ok_test"),
102-
target_under_test_with_aspect = Label("//test/clippy:ok_test"),
10393
)
10494

10595
native.test_suite(

0 commit comments

Comments
 (0)