Skip to content

Commit 4731a51

Browse files
committed
Revert RegexBuilder workaround
1 parent 80588e9 commit 4731a51

File tree

5 files changed

+1
-13
lines changed

5 files changed

+1
-13
lines changed

Sources/FoundationEssentials/URL/URLTemplate.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ extension URL {
130130
}
131131

132132
// MARK: - Parse
133-
#if FOUNDATION_FRAMEWORK
133+
134134
extension URL.Template {
135135
/// Creates a new template from its text form.
136136
///
@@ -164,7 +164,6 @@ extension URL.Template {
164164
}
165165
}
166166
}
167-
#endif
168167

169168
// MARK: -
170169

Sources/FoundationEssentials/URL/URLTemplate_Expression.swift

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#if FOUNDATION_FRAMEWORK
1413
internal import RegexBuilder
15-
#endif
16-
1714
#if canImport(CollectionsInternal)
1815
internal import CollectionsInternal
1916
#elseif canImport(OrderedCollections)
@@ -82,7 +79,6 @@ extension URL.Template.Expression.Element: CustomStringConvertible {
8279
}
8380
}
8481

85-
#if FOUNDATION_FRAMEWORK
8682
extension URL.Template.Expression {
8783
init(_ input: String) throws {
8884
var remainder = input[...]
@@ -206,7 +202,6 @@ extension URL.Template {
206202
}
207203
}
208204
}
209-
#endif
210205

211206
// .------------------------------------------------------------------.
212207
// | NUL + . / ; ? & # |

Sources/FoundationEssentials/URL/URLTemplate_PercentEncoding.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@
1010
//
1111
//===----------------------------------------------------------------------===//
1212

13-
#if FOUNDATION_FRAMEWORK
1413
internal import RegexBuilder
15-
#endif
1614

1715
extension String {
1816
/// Convert to NFC and percent-escape.

Tests/FoundationEssentialsTests/URITemplatingTests/URLTemplate_ExpressionTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ import struct Foundation.URL
2020
#endif
2121
import Testing
2222

23-
#if FOUNDATION_FRAMEWORK
2423
@Suite("URL.Template Expression")
2524
private enum ExpressionTests {
2625
private typealias Expression = URL.Template.Expression
@@ -277,4 +276,3 @@ private enum ExpressionTests {
277276
#expect((try? Expression(input)) == nil, "Should fail to parse, but not crash.")
278277
}
279278
}
280-
#endif

Tests/FoundationEssentialsTests/URITemplatingTests/URLTemplate_TemplateTests.swift

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,6 @@ private var variables: [URL.Template.VariableName: URL.Template.Value] {
5454
]
5555
}
5656

57-
#if FOUNDATION_FRAMEWORK
5857
private func assertReplacing(template: String, result: String, sourceLocation: SourceLocation = #_sourceLocation) {
5958
do {
6059
let t = try #require(URL.Template(template))
@@ -264,4 +263,3 @@ private enum TemplateTests {
264263
assertReplacing(template: "{&keys*}", result: "&semi=%3B&dot=.&comma=%2C")
265264
}
266265
}
267-
#endif

0 commit comments

Comments
 (0)