Skip to content

Merge from swift/main to pick up #218 #220

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Mar 21, 2022
Merged

Merge from swift/main to pick up #218 #220

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a082e4a
Merge pull request #214 from rxwei/main-integration-rdar89791117
slavapestov Mar 18, 2022
6dd411e
Revert "Tweak a few generic signatures to work around a bug in the Re…
slavapestov Mar 18, 2022
46bf9a7
Merge pull request #218 from slavapestov/revert-workaround-rdar89791117
slavapestov Mar 18, 2022
f4cc29b
Merge branch 'swift/main' of github.com:apple/swift-experimental-stri…
rxwei Mar 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions Sources/_StringProcessing/Algorithms/Algorithms/Replace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
with replacement: Replacement,
subrange: Range<Index>,
maxReplacements: Int = .max
) -> Self where Replacement.Element == Character {
) -> Self where Replacement.Element == Element {
replacing(
RegexConsumer(regex),
with: replacement,
Expand All @@ -166,7 +166,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
_ regex: R,
with replacement: Replacement,
maxReplacements: Int = .max
) -> Self where Replacement.Element == Character {
) -> Self where Replacement.Element == Element {
replacing(
regex,
with: replacement,
Expand All @@ -178,7 +178,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
_ regex: R,
with replacement: Replacement,
maxReplacements: Int = .max
) where Replacement.Element == Character {
) where Replacement.Element == Element {
self = replacing(
regex,
with: replacement,
Expand Down
6 changes: 3 additions & 3 deletions Sources/_StringProcessing/Algorithms/Matching/MatchReplace.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
with replacement: (_MatchResult<RegexConsumer<R, Substring>>) throws -> Replacement,
subrange: Range<Index>,
maxReplacements: Int = .max
) rethrows -> Self where Replacement.Element == Character {
) rethrows -> Self where Replacement.Element == Element {
try replacing(
RegexConsumer(regex),
with: replacement,
Expand All @@ -92,7 +92,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
_ regex: R,
with replacement: (_MatchResult<RegexConsumer<R, Substring>>) throws -> Replacement,
maxReplacements: Int = .max
) rethrows -> Self where Replacement.Element == Character {
) rethrows -> Self where Replacement.Element == Element {
try replacing(
regex,
with: replacement,
Expand All @@ -104,7 +104,7 @@ extension RangeReplaceableCollection where SubSequence == Substring {
_ regex: R,
with replacement: (_MatchResult<RegexConsumer<R, Substring>>) throws -> Replacement,
maxReplacements: Int = .max
) rethrows where Replacement.Element == Character {
) rethrows where Replacement.Element == Element {
self = try replacing(
regex,
with: replacement,
Expand Down