From 8f2d6a559983b5c1faeb7fe80cc01201851c9ac9 Mon Sep 17 00:00:00 2001 From: Allan Shortlidge Date: Tue, 24 Sep 2024 09:58:13 -0700 Subject: [PATCH] Add missing imports of _RegexParser. While experimenting with adopting the `MemberImportVisibility` experimental feature (SE-0444) in the standard library build, I found that the `_StringProcessing` module was relying on transitive imports of `_RegexParser` in many source files. --- Sources/_StringProcessing/Engine/MEQuantify.swift | 2 ++ Sources/_StringProcessing/Engine/Processor.swift | 1 + Sources/_StringProcessing/Regex/Match.swift | 2 ++ Sources/_StringProcessing/Unicode/NFC.swift | 2 ++ Sources/_StringProcessing/Unicode/ScalarProps.swift | 2 ++ Sources/_StringProcessing/Unicode/WordBreaking.swift | 2 ++ Sources/_StringProcessing/Utility/TypedInt.swift | 1 + 7 files changed, 12 insertions(+) diff --git a/Sources/_StringProcessing/Engine/MEQuantify.swift b/Sources/_StringProcessing/Engine/MEQuantify.swift index b3d4818b0..48bbb9e9c 100644 --- a/Sources/_StringProcessing/Engine/MEQuantify.swift +++ b/Sources/_StringProcessing/Engine/MEQuantify.swift @@ -1,3 +1,5 @@ +internal import _RegexParser + private typealias ASCIIBitset = DSLTree.CustomCharacterClass.AsciiBitset extension Processor { diff --git a/Sources/_StringProcessing/Engine/Processor.swift b/Sources/_StringProcessing/Engine/Processor.swift index ff2b9037f..d6b2cfe0c 100644 --- a/Sources/_StringProcessing/Engine/Processor.swift +++ b/Sources/_StringProcessing/Engine/Processor.swift @@ -9,6 +9,7 @@ // //===----------------------------------------------------------------------===// +internal import _RegexParser enum MatchMode { case wholeString diff --git a/Sources/_StringProcessing/Regex/Match.swift b/Sources/_StringProcessing/Regex/Match.swift index f13b01a85..0b0b2e797 100644 --- a/Sources/_StringProcessing/Regex/Match.swift +++ b/Sources/_StringProcessing/Regex/Match.swift @@ -9,6 +9,8 @@ // //===----------------------------------------------------------------------===// +internal import _RegexParser + @available(SwiftStdlib 5.7, *) extension Regex { /// The result of matching a regular expression against a string. diff --git a/Sources/_StringProcessing/Unicode/NFC.swift b/Sources/_StringProcessing/Unicode/NFC.swift index 59d195bb6..28ba15351 100644 --- a/Sources/_StringProcessing/Unicode/NFC.swift +++ b/Sources/_StringProcessing/Unicode/NFC.swift @@ -9,6 +9,8 @@ // //===----------------------------------------------------------------------===// +internal import _RegexParser + @_spi(_Unicode) import Swift diff --git a/Sources/_StringProcessing/Unicode/ScalarProps.swift b/Sources/_StringProcessing/Unicode/ScalarProps.swift index 8864fd459..5344ce065 100644 --- a/Sources/_StringProcessing/Unicode/ScalarProps.swift +++ b/Sources/_StringProcessing/Unicode/ScalarProps.swift @@ -9,6 +9,8 @@ // //===----------------------------------------------------------------------===// +internal import _RegexParser + @_silgen_name("_swift_string_processing_getScript") func _swift_string_processing_getScript(_: UInt32) -> UInt8 diff --git a/Sources/_StringProcessing/Unicode/WordBreaking.swift b/Sources/_StringProcessing/Unicode/WordBreaking.swift index 10aadde32..a1f2f13a6 100644 --- a/Sources/_StringProcessing/Unicode/WordBreaking.swift +++ b/Sources/_StringProcessing/Unicode/WordBreaking.swift @@ -9,6 +9,8 @@ // //===----------------------------------------------------------------------===// +internal import _RegexParser + @_spi(_Unicode) import Swift diff --git a/Sources/_StringProcessing/Utility/TypedInt.swift b/Sources/_StringProcessing/Utility/TypedInt.swift index e03f2572f..b85282eab 100644 --- a/Sources/_StringProcessing/Utility/TypedInt.swift +++ b/Sources/_StringProcessing/Utility/TypedInt.swift @@ -9,6 +9,7 @@ // //===----------------------------------------------------------------------===// +internal import _RegexParser // Just a phantom-typed Int wrapper. struct TypedInt<👻>: RawRepresentable, Hashable {