Build 0.20.8.0

2022-11-25 19:56:30 +02:00
parent ecb6d40b4b
commit df805574c4
111 changed files with 2347 additions and 1283 deletions
@@ -1,4 +1,7 @@
 #nullable enable
+using System;
+using System.Diagnostics.CodeAnalysis;
+
 namespace Barotrauma
 {
    public abstract class Result<T, TError>
@@ -13,6 +16,14 @@ namespace Barotrauma
        
        public static Failure<T, TError> Failure(TError error)
            => new Failure<T, TError>(error);
+
+        public abstract bool TryUnwrapSuccess([MaybeNullWhen(returnValue: false)] out T value);
+        public abstract bool TryUnwrapFailure([MaybeNullWhen(returnValue: false)] out TError value);
+        
+        public abstract override string? ToString();
+
+        public static (Func<T, Result<T, TError>> Success, Func<TError, Result<T, TError>> Failure) GetFactoryMethods()
+            => (Success, Failure);
    }

    public sealed class Success<T, TError> : Result<T, TError>
@@ -22,6 +33,21 @@ namespace Barotrauma
        public readonly T Value;
        public override bool IsSuccess => true;

+        public override bool TryUnwrapSuccess([MaybeNullWhen(returnValue: false)] out T value)
+        {
+            value = Value;
+            return true;
+        }
+
+        public override bool TryUnwrapFailure([MaybeNullWhen(returnValue: false)] out TError value)
+        {
+            value = default;
+            return false;
+        }
+
+        public override string ToString()
+            => $"Success<{typeof(T).NameWithGenerics()}, {typeof(TError).NameWithGenerics()}>({Value})";
+
        public Success(T value)
        {
            Value = value;
@@ -35,6 +61,21 @@ namespace Barotrauma
        public readonly TError Error;

        public override bool IsSuccess => false;
+        
+        public override bool TryUnwrapSuccess([MaybeNullWhen(returnValue: false)] out T value)
+        {
+            value = default;
+            return false;
+        }
+
+        public override bool TryUnwrapFailure([MaybeNullWhen(returnValue: false)] out TError value)
+        {
+            value = Error;
+            return true;
+        }
+        
+        public override string ToString()
+            => $"Failure<{typeof(T).NameWithGenerics()}, {typeof(TError).NameWithGenerics()}>({Error})";

        public Failure(TError error)
        {