@@ -28,8 +28,12 @@ extension RFC_5321 {
2828 /// Initialize with validated components
2929 ///
3030 /// This is the canonical initializer. Components are already validated.
31- public init ( displayName: ( some StringProtocol ) ? = nil , localPart: LocalPart , domain: RFC_1123 . Domain ) throws ( Error) {
32- self . displayName = displayName. map { String ( $0) . trimming ( . ascii. whitespaces) }
31+ public init (
32+ displayName: String ? = nil ,
33+ localPart: LocalPart ,
34+ domain: RFC_1123 . Domain
35+ ) throws ( Error) {
36+ self . displayName = displayName? . trimming ( . ascii. whitespaces)
3337 self . localPart = localPart
3438 self . domain = domain
3539
@@ -89,10 +93,8 @@ extension RFC_5321.EmailAddress {
8993 let domain : RFC_1123 . Domain
9094 do {
9195 domain = try RFC_1123 . Domain ( domainString)
92- } catch let domainError as Domain . ValidationError {
96+ } catch let domainError {
9397 throw Error . invalidDomain ( domainError)
94- } catch {
95- fatalError ( " Unexpected error type from RFC_1123.Domain.init: \( error) " )
9698 }
9799
98100 try self . init (
@@ -120,14 +122,12 @@ extension RFC_5321.EmailAddress {
120122 let domain : RFC_1123 . Domain
121123 do {
122124 domain = try RFC_1123 . Domain ( domainString)
123- } catch let domainError as Domain . ValidationError {
125+ } catch let domainError {
124126 throw Error . invalidDomain ( domainError)
125- } catch {
126- fatalError ( " Unexpected error type from RFC_1123.Domain.init: \( error) " )
127127 }
128128
129129 try self . init (
130- displayName: nil as String ? ,
130+ displayName: nil ,
131131 localPart: localPart,
132132 domain: domain
133133 )
@@ -187,5 +187,5 @@ extension RFC_5321.EmailAddress: Codable {
187187
188188extension RFC_5321. EmailAddress : RawRepresentable {
189189 public var rawValue: String { String ( self ) }
190- public init? ( rawValue: some StringProtocol ) { try ? self . init ( rawValue) }
190+ public init? ( rawValue: String ) { try ? self . init ( rawValue) }
191191}
0 commit comments