diff --git a/Sources/MultipartKit/MultipartMessageError.swift b/Sources/MultipartKit/MultipartMessageError.swift deleted file mode 100644 index 7b6cae2..0000000 --- a/Sources/MultipartKit/MultipartMessageError.swift +++ /dev/null @@ -1,4 +0,0 @@ -/// Higher level semantic/structural errors. -package enum MultipartMessageError: Error, Equatable { - case unexpectedEndOfFile -} diff --git a/Sources/MultipartKit/MultipartParser+parse.swift b/Sources/MultipartKit/MultipartParser+parse.swift index a8ad435..8448dad 100644 --- a/Sources/MultipartKit/MultipartParser+parse.swift +++ b/Sources/MultipartKit/MultipartParser+parse.swift @@ -36,7 +36,7 @@ extension MultipartParser { case .needMoreData: // In synchronous parsing with all data provided upfront, // needing more data indicates an incomplete/corrupted message - throw MultipartMessageError.unexpectedEndOfFile + throw MultipartParserError.unexpectedEndOfFile case .error(let error): throw error diff --git a/Sources/MultipartKit/StreamingMultipartParserAsyncSequence+Isolation.swift b/Sources/MultipartKit/StreamingMultipartParserAsyncSequence+Isolation.swift index 228cbaf..efe3a42 100644 --- a/Sources/MultipartKit/StreamingMultipartParserAsyncSequence+Isolation.swift +++ b/Sources/MultipartKit/StreamingMultipartParserAsyncSequence+Isolation.swift @@ -37,7 +37,7 @@ extension StreamingMultipartParserAsyncSequence.AsyncIterator { do { next = try await iterator.next(isolation: actor) } catch { - throw MultipartParserError.backingSequenceError(underlyingReason: "\(error)") + throw MultipartParserError.backingSequenceError(reason: "\(error)") } if let next { parser.append(buffer: next) diff --git a/Sources/MultipartKit/StreamingMultipartParserAsyncSequence.swift b/Sources/MultipartKit/StreamingMultipartParserAsyncSequence.swift index 4bbc95d..917050a 100644 --- a/Sources/MultipartKit/StreamingMultipartParserAsyncSequence.swift +++ b/Sources/MultipartKit/StreamingMultipartParserAsyncSequence.swift @@ -81,7 +81,7 @@ where BackingSequence.Element: MultipartPartBodyElement & RangeReplaceableCollec do { next = try await iterator.next() } catch { - throw MultipartParserError.backingSequenceError(underlyingReason: "\(error)") + throw MultipartParserError.backingSequenceError(reason: "\(error)") } if let next { parser.append(buffer: next) diff --git a/Tests/MultipartKitTests/ParserTests.swift b/Tests/MultipartKitTests/ParserTests.swift index d3a634b..0b35519 100644 --- a/Tests/MultipartKitTests/ParserTests.swift +++ b/Tests/MultipartKitTests/ParserTests.swift @@ -141,7 +141,7 @@ struct ParserTests { """.utf8 ) - #expect(throws: MultipartMessageError.unexpectedEndOfFile) { + #expect(throws: MultipartParserError.unexpectedEndOfFile) { _ = try MultipartParser<[UInt8]>(boundary: boundary) .parse([UInt8](message)) } @@ -149,7 +149,7 @@ struct ParserTests { let stream = makeParsingStream(for: message) var iterator = StreamingMultipartParserAsyncSequence(boundary: boundary, buffer: stream).makeAsyncIterator() - await #expect(throws: MultipartMessageError.unexpectedEndOfFile) { + await #expect(throws: MultipartParserError.unexpectedEndOfFile) { while (try await iterator.next()) != nil {} } } @@ -216,7 +216,7 @@ struct ParserTests { """.utf8 ) - #expect(throws: MultipartMessageError.unexpectedEndOfFile) { + #expect(throws: MultipartParserError.unexpectedEndOfFile) { _ = try MultipartParser<[UInt8]>(boundary: boundary) .parse([UInt8](message)) } @@ -224,7 +224,7 @@ struct ParserTests { let stream = makeParsingStream(for: message) var iterator = StreamingMultipartParserAsyncSequence(boundary: boundary, buffer: stream).makeAsyncIterator() - await #expect(throws: MultipartMessageError.unexpectedEndOfFile) { + await #expect(throws: MultipartParserError.unexpectedEndOfFile) { while (try await iterator.next()) != nil {} } }