Skip to content

Commit 147bd65

Browse files
committed
chore(routing): flip swift-url-routing pin to branch main (W3) + mechanical drift fixes
- Package.swift: swift-url-routing 0.6.0 -> branch:"main"; removed stale "do NOT use branch:main" fork-pin comments (now false, this wave lands the rewrite). - Deleted Sources/URLFormCodingURLRouting/Form.Conversion.swift: the W2 rewrite folded an identical Form.Conversion<Value> into URLRouting itself (URLRouting now depends on URLFormCoding directly), so the local copy caused an "ambiguous type name" collision. Dissolved in favor of the vended equivalent (same name/signature, upgraded to typed throws). - URLRouting.Conversion.swift: Conversions.Map -> Parser.Conversion.Map (W2 rename of the conversion-chaining combinator). Build/test green (167 tests passed).
1 parent 041a4a7 commit 147bd65

3 files changed

Lines changed: 2 additions & 200 deletions

File tree

Package.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,6 @@ extension Target.Dependency {
1414
static var urlFormCodingURLRouting: Self { .target(name: .urlFormCodingURLRouting) }
1515
static var rfc2388: Self { .product(name: "RFC 2388", package: "swift-rfc-2388") }
1616
static var whatwgUrlEncoding: Self { .product(name: "WHATWG Form URL Encoded", package: "swift-whatwg-url") }
17-
// Institute fork URL (principal ruling 2026-07-09); pinned to upstream-identical tags
18-
// (0.6.2 = pointfree release SHA); do NOT use branch:main until the RFC-first rewrite lands via the routing arc.
1917
static var urlRouting: Self { .product(name: "URLRouting", package: "swift-url-routing") }
2018
}
2119

@@ -40,10 +38,8 @@ let package = Package(
4038
dependencies: [
4139
.package(url: "https://github.com/swift-ietf/swift-rfc-2388.git", branch: "main"),
4240
.package(url: "https://github.com/swift-whatwg/swift-whatwg-url.git", branch: "main"),
43-
// Institute fork URL (principal ruling 2026-07-09); pinned to upstream-identical tags
44-
// (0.6.2 = pointfree release SHA); do NOT use branch:main until the RFC-first rewrite lands via the routing arc.
4541
// This backs the standalone URLFormCodingURLRouting product only; the URLFormCoding product is unaffected.
46-
.package(url: "https://github.com/swift-foundations/swift-url-routing.git", from: "0.6.0")
42+
.package(url: "https://github.com/swift-foundations/swift-url-routing.git", branch: "main")
4743
],
4844
targets: [
4945
.target(

Sources/URLFormCodingURLRouting/Form.Conversion.swift

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

Sources/URLFormCodingURLRouting/URLRouting.Conversion.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ extension URLRouting.Conversion {
8989
_ type: Value.Type,
9090
decoder: Form.Decoder = .init(),
9191
encoder: Form.Encoder = .init()
92-
) -> Conversions.Map<Self, Form.Conversion<Value>> {
92+
) -> Parser.Conversion.Map<Self, Form.Conversion<Value>> {
9393
self.map(.form(type, decoder: decoder, encoder: encoder))
9494
}
9595
}

0 commit comments

Comments
 (0)