Skip to content

Commit 39c54d3

Browse files
authored
Merge pull request #199 from slavapestov/rqm-workaround-rdar89791117
Tweak a few generic signatures to work around a bug in the Requirement Machine
2 parents b234d9d + 695cf99 commit 39c54d3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

Sources/_StringProcessing/Algorithms/Algorithms/Replace.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
154154
with replacement: Replacement,
155155
subrange: Range<Index>,
156156
maxReplacements: Int = .max
157-
) -> Self where Replacement.Element == Element {
157+
) -> Self where Replacement.Element == Character {
158158
replacing(
159159
RegexConsumer(regex),
160160
with: replacement,
@@ -166,7 +166,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
166166
_ regex: R,
167167
with replacement: Replacement,
168168
maxReplacements: Int = .max
169-
) -> Self where Replacement.Element == Element {
169+
) -> Self where Replacement.Element == Character {
170170
replacing(
171171
regex,
172172
with: replacement,
@@ -178,7 +178,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
178178
_ regex: R,
179179
with replacement: Replacement,
180180
maxReplacements: Int = .max
181-
) where Replacement.Element == Element {
181+
) where Replacement.Element == Character {
182182
self = replacing(
183183
regex,
184184
with: replacement,

Sources/_StringProcessing/Algorithms/Matching/MatchReplace.swift

+3-3
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
8080
with replacement: (_MatchResult<RegexConsumer<R, Substring>>) throws -> Replacement,
8181
subrange: Range<Index>,
8282
maxReplacements: Int = .max
83-
) rethrows -> Self where Replacement.Element == Element {
83+
) rethrows -> Self where Replacement.Element == Character {
8484
try replacing(
8585
RegexConsumer(regex),
8686
with: replacement,
@@ -92,7 +92,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
9292
_ regex: R,
9393
with replacement: (_MatchResult<RegexConsumer<R, Substring>>) throws -> Replacement,
9494
maxReplacements: Int = .max
95-
) rethrows -> Self where Replacement.Element == Element {
95+
) rethrows -> Self where Replacement.Element == Character {
9696
try replacing(
9797
regex,
9898
with: replacement,
@@ -104,7 +104,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
104104
_ regex: R,
105105
with replacement: (_MatchResult<RegexConsumer<R, Substring>>) throws -> Replacement,
106106
maxReplacements: Int = .max
107-
) rethrows where Replacement.Element == Element {
107+
) rethrows where Replacement.Element == Character {
108108
self = try replacing(
109109
regex,
110110
with: replacement,

0 commit comments

Comments
 (0)