Skip to content

Commit 11ee56e

Browse files
committed
remove warnings
1 parent 62a31ea commit 11ee56e

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

Sources/FormData/Parser.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,9 @@ public final class Parser {
3838
case .finished(let key, let value):
3939
switch key {
4040
case .name:
41-
name = value.string
41+
name = value.makeString()
4242
case .filename:
43-
filename = value.string
43+
filename = value.makeString()
4444
case .other:
4545
break
4646
}

Sources/Multipart/Parser.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public final class Parser {
7373

7474
/// Extracts the boundary from a multipart Content-Type header
7575
public static func extractBoundary(contentType: BytesConvertible) throws -> Bytes {
76-
let boundaryPieces = try contentType.makeBytes().string.components(separatedBy: "boundary=")
76+
let boundaryPieces = try contentType.makeBytes().makeString().components(separatedBy: "boundary=")
7777
guard boundaryPieces.count == 2 else {
7878
throw Error.invalidBoundary
7979
}
@@ -176,8 +176,8 @@ public final class Parser {
176176
case .parsingValue:
177177
break
178178
case .finished(let key, let value):
179-
let headerKey = HeaderKey(key.trimmed([.space]).string)
180-
headers[headerKey] = value.trimmed([.space]).string
179+
let headerKey = HeaderKey(key.trimmed([.space]).makeString())
180+
headers[headerKey] = value.trimmed([.space]).makeString()
181181

182182
// colon newline
183183
let pos = key.count + 1 + value.count + 2

Tests/FormDataTests/ParserTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ class ParserTests: XCTestCase {
101101

102102
try parser.multipart.parse(message)
103103

104-
XCTAssertEqual(fields["name"]?.part.body.string, "hi")
104+
XCTAssertEqual(fields["name"]?.part.body.makeString(), "hi")
105105
}
106106

107107
func testFormManyFields() throws {
@@ -136,7 +136,7 @@ class ParserTests: XCTestCase {
136136
try parser.multipart.parse(message)
137137

138138
for i in 1...5 {
139-
XCTAssertEqual(fields["field\(i)"]?.part.body.string, "The Quick Brown Fox Jumps Over The Lazy Dog", "Field 'field\(i)' was parsed incorrectly!")
139+
XCTAssertEqual(fields["field\(i)"]?.part.body.makeString(), "The Quick Brown Fox Jumps Over The Lazy Dog", "Field 'field\(i)' was parsed incorrectly!")
140140
}
141141
}
142142
}

Tests/FormDataTests/SerializerTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@ class SerializerTests: XCTestCase {
5151
expected += "Test123\r\n"
5252
expected += "--boundary42--\r\n"
5353

54-
XCTAssertEqual(serialized.string, expected)
54+
XCTAssertEqual(serialized.makeString(), expected)
5555
}
5656
}

Tests/MultipartTests/ParserTests.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class ParserTests: XCTestCase {
3434
let preambleExpectation = expectation(description: "preamble was parsed")
3535

3636
parser.onPreamble = { parsedPreamble in
37-
XCTAssertEqual(parsedPreamble.string, preamble)
37+
XCTAssertEqual(parsedPreamble.makeString(), preamble)
3838
preambleExpectation.fulfill()
3939
}
4040

@@ -59,7 +59,7 @@ class ParserTests: XCTestCase {
5959
let preambleExpectation = expectation(description: "preamble was parsed")
6060

6161
parser.onPreamble = { parsedPreamble in
62-
XCTAssertEqual(parsedPreamble.string, preamble)
62+
XCTAssertEqual(parsedPreamble.makeString(), preamble)
6363
preambleExpectation.fulfill()
6464
}
6565

@@ -89,7 +89,7 @@ class ParserTests: XCTestCase {
8989
let partExpectation = expectation(description: "part was parsed")
9090

9191
parser.onPart = { part in
92-
XCTAssertEqual(part.body.string, part1)
92+
XCTAssertEqual(part.body.makeString(), part1)
9393
partExpectation.fulfill()
9494
}
9595

@@ -115,7 +115,7 @@ class ParserTests: XCTestCase {
115115
let partExpectation = expectation(description: "part was parsed")
116116

117117
parser.onPart = { part in
118-
XCTAssertEqual(part.body.string, part1)
118+
XCTAssertEqual(part.body.makeString(), part1)
119119
XCTAssertEqual(part.headers.count, 2)
120120
XCTAssertEqual(part.headers["key"], "value")
121121
XCTAssertEqual(part.headers["foo"], "bar")
@@ -143,7 +143,7 @@ class ParserTests: XCTestCase {
143143
let epilogueExpectation = expectation(description: "epilogue was parsed")
144144

145145
parser.onEpilogue = { e in
146-
XCTAssertEqual(e.string, epilogue)
146+
XCTAssertEqual(e.makeString(), epilogue)
147147
epilogueExpectation.fulfill()
148148
}
149149

Tests/MultipartTests/SerializerTests.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,6 @@ class SerializerTests: XCTestCase {
4646
expected += "Test123\r\n"
4747
expected += "--boundary42--\r\n"
4848

49-
XCTAssertEqual(serialized.string, expected)
49+
XCTAssertEqual(serialized.makeString(), expected)
5050
}
5151
}

0 commit comments

Comments
 (0)