Merge pull request #946 from adamralph/refactor

minor refactoring
adamralph · Feb 11, 2024 · 1dbf0fb · 1dbf0fb
2 parents 2212383 + 1452cc3
commit 1dbf0fb
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 6 deletions.
diff --git a/Bullseye/Internal/TaskExtensions.cs b/Bullseye/Internal/TaskExtensions.cs
@@ -9,5 +9,5 @@ public static class TaskExtensions
 
     public static ConfiguredTaskAwaitable<TResult> Tax<TResult>(this Task<TResult> task) => task.ConfigureAwait(false);
 
-    public static bool IsAwaitable(this Task task) => !task.IsCanceled && !task.IsFaulted && !task.IsCompleted;
+    public static bool IsAwaitable(this Task task) => task is { IsCanceled: false, IsFaulted: false, IsCompleted: false, };
 }
diff --git a/Bullseye/Internal/TimeSpanExtensions.cs b/Bullseye/Internal/TimeSpanExtensions.cs
@@ -22,14 +22,16 @@ public static string Humanize(this TimeSpan duration)
             return "0 ms";
         }
 
+        var totalMilliseconds = Convert.ToInt64(duration.TotalMilliseconds);
+
         // less than one millisecond
-        if (Convert.ToInt64(duration.TotalMilliseconds) < 1L)
+        if (totalMilliseconds < 1L)
         {
             return "<1 ms";
         }
 
         // milliseconds
-        if (Convert.ToInt64(duration.TotalMilliseconds) < 1_000L)
+        if (totalMilliseconds < 1_000L)
         {
             return duration.TotalMilliseconds.ToString("F0", provider) + " ms";
         }
@@ -40,10 +42,12 @@ public static string Humanize(this TimeSpan duration)
             return duration.TotalSeconds.ToString("F2", provider) + " s";
         }
 
+        var totalSeconds = Convert.ToInt64(duration.TotalSeconds);
+
         // minutes and seconds
-        if (Convert.ToInt64(duration.TotalSeconds) < 3600L)
+        if (totalSeconds < 3600L)
         {
-            var minutes = DivRem(Convert.ToInt64(duration.TotalSeconds), 60L, out var seconds);
+            var minutes = DivRem(totalSeconds, 60L, out var seconds);
             return seconds == 0
                 ? $"{minutes.ToString("F0", provider)} m"
                 : $"{minutes.ToString("F0", provider)} m {seconds.ToString("F0", provider)} s";

diff --git a/BullseyeSmokeTester.CommandLine/Program.cs b/BullseyeSmokeTester.CommandLine/Program.cs
@@ -3,7 +3,7 @@
 using Bullseye;
 using static Bullseye.Targets;
 
-var foo = new Option<string>(new[] { "--foo", "-f", }, "A value used for something.");
+var foo = new Option<string>(["--foo", "-f",], "A value used for something.");
 
 #pragma warning disable IDE0028
 var cmd = new RootCommand { foo, };