Skip to content
This repository was archived by the owner on Jan 25, 2024. It is now read-only.

Commit 789b20b

Browse files
thomasvlswiple-rules-gardener
authored andcommitted
Remove SwiftInfo.module_name, it was deprecated a while ago.
RELNOTES: None PiperOrigin-RevId: 348027802
1 parent 875de9f commit 789b20b

File tree

2 files changed

+0
-18
lines changed

2 files changed

+0
-18
lines changed

swift/internal/providers.bzl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@ library that directly propagated this provider.
3333
"direct_modules": """\
3434
`List` of values returned from `swift_common.create_module`. The modules (both
3535
Swift and C/Objective-C) emitted by the library that propagated this provider.
36-
""",
37-
"module_name": """\
38-
`String`. The name of the Swift module represented by the target that directly
39-
propagated this provider.
40-
41-
This field will be equal to the explicitly assigned module name (if present);
42-
otherwise, it will be equal to the autogenerated module name.
43-
44-
This field is deprecated; use `direct_modules` instead.
4536
""",
4637
"swift_version": """\
4738
`String`. The version of the Swift language that was used when compiling the
@@ -346,8 +337,6 @@ def create_swift_info(
346337
return SwiftInfo(
347338
direct_defines = defines,
348339
direct_modules = modules,
349-
# TODO(b/149999519): Remove the legacy `module_name`.
350-
module_name = modules[0].name if len(modules) == 1 else None,
351340
swift_version = swift_version,
352341
transitive_defines = depset(defines, transitive = transitive_defines),
353342
transitive_modules = depset(modules, transitive = transitive_modules),

swift/internal/swift_module_alias.bzl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,6 @@ def _swift_module_alias_impl(ctx):
3434
for module in dep[SwiftInfo].direct_modules
3535
}
3636

37-
# TODO(b/149999519): remove the support for SwiftInfo.module_name that
38-
# didn't have any direct_modules.
39-
for dep in deps:
40-
swift_info = dep[SwiftInfo]
41-
if not swift_info.direct_modules and swift_info.module_name:
42-
module_mapping[swift_info.module_name] = dep.label
43-
4437
module_name = ctx.attr.module_name
4538
if not module_name:
4639
module_name = swift_common.derive_module_name(ctx.label)

0 commit comments

Comments
 (0)