Skip to content

Commit c935de3

Browse files
allevatoswiple-rules-gardener
authored andcommitted
Completely remove the SwiftClangModuleInfo provider.
Tulsi has been updated to no longer depend on this. RELNOTES: None. PiperOrigin-RevId: 251224014
1 parent 1912958 commit c935de3

File tree

4 files changed

+1
-92
lines changed

4 files changed

+1
-92
lines changed

swift/internal/attrs.bzl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
"""Common attributes used by multiple Swift build rules."""
1616

17-
load(":legacy_swift_clang_module_info_aspect.bzl", "legacy_swift_clang_module_info_aspect")
1817
load(":providers.bzl", "SwiftInfo")
1918

2019
def swift_common_rule_attrs(additional_deps_aspects = []):
@@ -30,7 +29,7 @@ binary or library, or other programs needed by it.
3029
""",
3130
),
3231
"deps": attr.label_list(
33-
aspects = [legacy_swift_clang_module_info_aspect] + additional_deps_aspects,
32+
aspects = additional_deps_aspects,
3433
doc = """
3534
A list of targets that are dependencies of the target being built, which will be
3635
linked into that target. Allowed kinds of dependencies are:

swift/internal/legacy_swift_clang_module_info_aspect.bzl

Lines changed: 0 additions & 61 deletions
This file was deleted.

swift/internal/providers.bzl

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -14,33 +14,6 @@
1414

1515
"""Defines Skylark providers that propagated by the Swift BUILD rules."""
1616

17-
SwiftClangModuleInfo = provider(
18-
doc = """
19-
Contains information about a Clang module with relative paths that needs to be propagated up to
20-
other Swift compilation/link actions.
21-
22-
This provider is deprecated and will be removed in a future release.
23-
""",
24-
fields = {
25-
"transitive_compile_flags": """
26-
`Depset` of `string`s. The C compiler flags that should be passed to Clang when depending on this
27-
target (for example, header search paths).
28-
""",
29-
"transitive_defines": """
30-
`Depset` of `string`s. The C preprocessor defines that should be passed to Clang when depending on
31-
this target.
32-
""",
33-
"transitive_headers": """
34-
`Depset` of `File`s. The transitive header files that must be available to compile actions when
35-
depending on this target.
36-
""",
37-
"transitive_modulemaps": """
38-
`Depset` of `File`s. The transitive module map files that will be passed to Clang using the
39-
`-fmodule-map-file` option.
40-
""",
41-
},
42-
)
43-
4417
SwiftInfo = provider(
4518
doc = """
4619
Contains information about the compiled artifacts of a Swift module.

swift/swift.bzl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ load(
2424
)
2525
load(
2626
"@build_bazel_rules_swift//swift/internal:providers.bzl",
27-
_SwiftClangModuleInfo = "SwiftClangModuleInfo",
2827
_SwiftInfo = "SwiftInfo",
2928
_SwiftProtoInfo = "SwiftProtoInfo",
3029
_SwiftToolchainInfo = "SwiftToolchainInfo",
@@ -65,7 +64,6 @@ load(
6564
)
6665

6766
# Re-export providers.
68-
SwiftClangModuleInfo = _SwiftClangModuleInfo
6967
SwiftInfo = _SwiftInfo
7068
SwiftProtoInfo = _SwiftProtoInfo
7169
SwiftToolchainInfo = _SwiftToolchainInfo

0 commit comments

Comments
 (0)