Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove swift info provider creation inside hmap rule #919

Merged
merged 5 commits into from
Sep 19, 2024
Merged

Remove swift info provider creation inside hmap rule #919

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0a19e1c
Remove allocation of extra swift module
gyfelton Sep 16, 2024
722999d
Revert "Remove allocation of extra swift module"
gyfelton Sep 17, 2024
f61af30
Move clang module creation to top level
gyfelton Sep 17, 2024
afb8179
Remove SwiftInfo creation inside hmap creation rule
gyfelton Sep 17, 2024
4793515
Merge branch 'master' into yuanfeng/remove-swift-info-passing-hmap
gyfelton Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 0 additions & 10 deletions rules/hmap.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,22 +78,12 @@ def _make_headermap_impl(ctx):
cc_info_provider = CcInfo(
compilation_context = compilation_context,
)
swift_info_provider = swift_common.create_swift_info(
modules = [swift_common.create_module(
name = ctx.attr.name,
clang = swift_common.create_clang_module(
compilation_context = compilation_context,
module_map = None,
),
)],
)
providers = [
DefaultInfo(
files = depset([headermap]),
),
apple_common.new_objc_provider(),
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should try to remove this as well

Copy link
Contributor Author

@gyfelton gyfelton Sep 18, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

my understanding is bazel 6 still need it. but i can be wrong.
I feel that demands a separate PR to just remove all apple_common.Objc references? Also helps when have test against bazel "7.4" / nightly as the API apple_common.Objc is just gone now: https://bazel.build/rules/lib/toplevel/apple_common

cc_info_provider,
swift_info_provider,
]

hdrs_lists = [l for l in hdrs_lists if l]
Expand Down