Conditionally Support CustomStringConvertible on Result
Signed-off-by: Will Hawkins <hawkinsw@obs.cr>
This commit is contained in:
@@ -32,8 +32,8 @@ public struct Nothing: CustomStringConvertible {
|
||||
}
|
||||
|
||||
|
||||
public enum Result<T>: Equatable, CustomStringConvertible {
|
||||
case Ok(T)
|
||||
public enum Result<OKT>: Equatable {
|
||||
case Ok(OKT)
|
||||
case Error(Error)
|
||||
|
||||
public static func == (lhs: Result, rhs: Result) -> Bool {
|
||||
@@ -53,7 +53,9 @@ public enum Result<T>: Equatable, CustomStringConvertible {
|
||||
}
|
||||
return nil
|
||||
}
|
||||
}
|
||||
|
||||
extension Result where OKT: CustomStringConvertible {
|
||||
public var description: String {
|
||||
switch self {
|
||||
case Result.Error(let e):
|
||||
@@ -64,6 +66,17 @@ public enum Result<T>: Equatable, CustomStringConvertible {
|
||||
}
|
||||
}
|
||||
|
||||
extension Result {
|
||||
public var description: String {
|
||||
switch self {
|
||||
case Result.Error(let e):
|
||||
return e.msg
|
||||
case Result.Ok(_):
|
||||
return "Ok"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@freestanding(expression) public macro RequireOkResult<T>(_: Result<T>) -> Bool =
|
||||
#externalMacro(module: "Macros", type: "RequireResult")
|
||||
@freestanding(expression) public macro RequireErrorResult<T>(_: Error, _: Result<T>) -> Bool =
|
||||
|
||||
Reference in New Issue
Block a user