Skip to content

Support initializing string with nonLossyASCII encoding #932

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 1 commit into from
Sep 20, 2024
Merged

Support initializing string with nonLossyASCII encoding #932

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion Sources/FoundationEssentials/String/String+IO.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ extension String {
where S.Iterator.Element == UInt8
{
switch encoding {
case .ascii:
case .ascii, .nonLossyASCII:
func makeString(buffer: UnsafeBufferPointer<UInt8>) -> String? {
return String(_validating: buffer, as: Unicode.ASCII.self)
}
Expand Down
7 changes: 7 additions & 0 deletions Tests/FoundationEssentialsTests/StringTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -983,6 +983,13 @@ final class StringTests : XCTestCase {
XCTAssertEqual("e\u{301}\u{301}f".data(using: .ascii, allowLossyConversion: true), Data([UInt8(ascii: "e"), 0xFF, 0xFF, UInt8(ascii: "f")]))
XCTAssertEqual("e\u{301}\u{301}f".data(using: .nonLossyASCII, allowLossyConversion: true), Data([UInt8(ascii: "e"), UInt8(ascii: "?"), UInt8(ascii: "?"), UInt8(ascii: "f")]))
}

func test_initWithBytes_ascii() {
XCTAssertEqual(String(bytes: "abc".utf8, encoding: String._Encoding.ascii), "abc")
XCTAssertEqual(String(bytes: "abc".utf8, encoding: String._Encoding.nonLossyASCII), "abc")
XCTAssertEqual(String(bytes: "e\u{301}\u{301}f".utf8, encoding: String._Encoding.ascii), nil)
XCTAssertEqual(String(bytes: "e\u{301}\u{301}f".utf8, encoding: String._Encoding.nonLossyASCII), nil)
}

func test_transmutingCompressingSlashes() {
let testCases: [(String, String)] = [
Expand Down