完了状態のTaskを生成するために Task.CompletedTask を使用する

diff --git a/OpenTween.Tests/Api/TwitterApiTest.cs b/OpenTween.Tests/Api/TwitterApiTest.cs
index f2868d9..f3bd107 100644 (file)
--- a/OpenTween.Tests/Api/TwitterApiTest.cs
+++ b/OpenTween.Tests/Api/TwitterApiTest.cs
@@ -718,7 +718,7 @@ namespace OpenTween.Api
   }
 }")
                 )
-                .Returns(Task.FromResult(0));
+                .Returns(Task.CompletedTask);
 
                 twitterApi.apiConnection = mock.Object;
 
@@ -1313,7 +1313,7 @@ namespace OpenTween.Api
                         },
                         new Dictionary<string, IMediaItem> { { "media", media } })
                 )
-                .Returns(Task.FromResult(0));
+                .Returns(Task.CompletedTask);
 
                 twitterApi.apiConnection = mock.Object;
 
@@ -1387,7 +1387,7 @@ namespace OpenTween.Api
                         new Uri("https://upload.twitter.com/1.1/media/metadata/create.json", UriKind.Absolute),
                         "{\"media_id\": \"12345\", \"alt_text\": {\"text\": \"hogehoge\"}}")
                 )
-                .Returns(Task.FromResult(0));
+                .Returns(Task.CompletedTask);
 
                 twitterApi.apiConnection = mock.Object;
 

diff --git a/OpenTween/Models/LocalSearchTabModel.cs b/OpenTween/Models/LocalSearchTabModel.cs
index 26e6402..0e11401 100644 (file)
--- a/OpenTween/Models/LocalSearchTabModel.cs
+++ b/OpenTween/Models/LocalSearchTabModel.cs
@@ -39,6 +39,6 @@ namespace OpenTween.Models
         }
 
         public override Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
-            => Task.FromResult(0); // 何もしない
+            => Task.CompletedTask; // 何もしない
     }
 }

diff --git a/OpenTween/Models/MuteTabModel.cs b/OpenTween/Models/MuteTabModel.cs
index fd0c88f..64ebf6f 100644 (file)
--- a/OpenTween/Models/MuteTabModel.cs
+++ b/OpenTween/Models/MuteTabModel.cs
@@ -45,6 +45,6 @@ namespace OpenTween.Models
         }
 
         public override Task RefreshAsync(Twitter tw, bool backward, bool startup, IProgress<string> progress)
-            => Task.FromResult(0); // 何もしない
+            => Task.CompletedTask; // 何もしない
     }
 }

diff --git a/OpenTween/Models/PostClass.cs b/OpenTween/Models/PostClass.cs
index 45a6250..ce7bb76 100644 (file)
--- a/OpenTween/Models/PostClass.cs
+++ b/OpenTween/Models/PostClass.cs
@@ -153,7 +153,7 @@ namespace OpenTween.Models
                 if (deepExpand)
                     this.ExpandTask = this.DeepExpandAsync();
                 else
-                    this.ExpandTask = Task.FromResult(0);
+                    this.ExpandTask = Task.CompletedTask;
             }
 
             protected virtual async Task DeepExpandAsync()

diff --git a/OpenTween/ShortcutCommand.cs b/OpenTween/ShortcutCommand.cs
index 235cc8c..a06afa0 100644 (file)
--- a/OpenTween/ShortcutCommand.cs
+++ b/OpenTween/ShortcutCommand.cs
@@ -67,7 +67,7 @@ namespace OpenTween
         private ShortcutCommand()
         {
             this.Shortcuts = Array.Empty<Keys>();
-            this.command = () => Task.FromResult(0);
+            this.command = () => Task.CompletedTask;
             this.onlyWhen = () => true;
             this.FocusedOn = FocusedControl.None;
             this.NotFocusedOn = FocusedControl.None;
@@ -166,14 +166,11 @@ namespace OpenTween
                 return this.instance;
             }
 
-            /// <summary>何もしないタスク</summary>
-            private static Task noOpTask = Task.FromResult(0);
-
             /// <summary>
             /// Action を Func&lt;Task&gt; に変換します
             /// </summary>
             private static Func<Task> SynchronousTask(Action action)
-                => () => { action(); return noOpTask; };
+                => () => { action(); return Task.CompletedTask; };
         }
     }
 }