Skip to content

Commit

Permalink
Completely remove the SwiftClangModuleInfo provider.
Browse files Browse the repository at this point in the history
Tulsi has been updated to no longer depend on this.

RELNOTES: None.
PiperOrigin-RevId: 251224014
  • Loading branch information
allevato authored and swiple-rules-gardener committed Jun 3, 2019
1 parent 1912958 commit c935de3
Show file tree
Hide file tree
Showing 4 changed files with 1 addition and 92 deletions.
3 changes: 1 addition & 2 deletions swift/internal/attrs.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

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

load(":legacy_swift_clang_module_info_aspect.bzl", "legacy_swift_clang_module_info_aspect")
load(":providers.bzl", "SwiftInfo")

def swift_common_rule_attrs(additional_deps_aspects = []):
Expand All @@ -30,7 +29,7 @@ binary or library, or other programs needed by it.
""",
),
"deps": attr.label_list(
aspects = [legacy_swift_clang_module_info_aspect] + additional_deps_aspects,
aspects = additional_deps_aspects,
doc = """
A list of targets that are dependencies of the target being built, which will be
linked into that target. Allowed kinds of dependencies are:
Expand Down
61 changes: 0 additions & 61 deletions swift/internal/legacy_swift_clang_module_info_aspect.bzl

This file was deleted.

27 changes: 0 additions & 27 deletions swift/internal/providers.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -14,33 +14,6 @@

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

SwiftClangModuleInfo = provider(
doc = """
Contains information about a Clang module with relative paths that needs to be propagated up to
other Swift compilation/link actions.
This provider is deprecated and will be removed in a future release.
""",
fields = {
"transitive_compile_flags": """
`Depset` of `string`s. The C compiler flags that should be passed to Clang when depending on this
target (for example, header search paths).
""",
"transitive_defines": """
`Depset` of `string`s. The C preprocessor defines that should be passed to Clang when depending on
this target.
""",
"transitive_headers": """
`Depset` of `File`s. The transitive header files that must be available to compile actions when
depending on this target.
""",
"transitive_modulemaps": """
`Depset` of `File`s. The transitive module map files that will be passed to Clang using the
`-fmodule-map-file` option.
""",
},
)

SwiftInfo = provider(
doc = """
Contains information about the compiled artifacts of a Swift module.
Expand Down
2 changes: 0 additions & 2 deletions swift/swift.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ load(
)
load(
"@build_bazel_rules_swift//swift/internal:providers.bzl",
_SwiftClangModuleInfo = "SwiftClangModuleInfo",
_SwiftInfo = "SwiftInfo",
_SwiftProtoInfo = "SwiftProtoInfo",
_SwiftToolchainInfo = "SwiftToolchainInfo",
Expand Down Expand Up @@ -65,7 +64,6 @@ load(
)

# Re-export providers.
SwiftClangModuleInfo = _SwiftClangModuleInfo
SwiftInfo = _SwiftInfo
SwiftProtoInfo = _SwiftProtoInfo
SwiftToolchainInfo = _SwiftToolchainInfo
Expand Down

0 comments on commit c935de3

Please sign in to comment.