From cdc3759c0432884d98705adb9c582bc40baf313d Mon Sep 17 00:00:00 2001 From: BlueBlock Date: Tue, 21 Mar 2023 12:06:38 -0400 Subject: [PATCH] Update Optional.cs - use more efficient empty assignments - use string interpolation - adjust method access to minimal needed --- mRemoteNG/Tools/Optional.cs | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/mRemoteNG/Tools/Optional.cs b/mRemoteNG/Tools/Optional.cs index 2d0c83eb6..37080bb9f 100644 --- a/mRemoteNG/Tools/Optional.cs +++ b/mRemoteNG/Tools/Optional.cs @@ -19,7 +19,7 @@ namespace mRemoteNG.Tools /// public Optional() { - _optional = new T[0]; + _optional = Array.Empty(); } /// @@ -30,7 +30,7 @@ namespace mRemoteNG.Tools { _optional = value != null ? new[] {value} - : new T[0]; + : Array.Empty(); } public override string ToString() @@ -97,9 +97,7 @@ namespace mRemoteNG.Tools if (_optional[0] is IComparable) return ((IComparable)_optional[0]).CompareTo(other.First()); - throw new ArgumentException(string.Format( - "Cannot compare objects. Optional type {0} is not comparable to itself", - typeof(T).FullName)); + throw new ArgumentException($"Cannot compare objects. Optional type {typeof(T).FullName} is not comparable to itself"); } #endregion @@ -121,7 +119,7 @@ namespace mRemoteNG.Tools return false; } - public bool Equals(Optional other) + private bool Equals(Optional other) { var otherObj = other.FirstOrDefault(); var thisObj = _optional.FirstOrDefault();