Use ValueTask

dotnet · Jun 3, 2022 · ff7fd2b · ff7fd2b
1 parent 4b82712
commit ff7fd2b
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/src/Http/Http.Features/src/IHttpConnectFeature.cs b/src/Http/Http.Features/src/IHttpConnectFeature.cs
@@ -23,5 +23,5 @@ public interface IHttpConnectFeature
     /// Send the response headers with a 200 status code and transition to opaque streaming.
     /// </summary>
     /// <returns>An opaque bidirectional stream.</returns>
-    Task<Stream> AcceptAsync();
+    ValueTask<Stream> AcceptAsync();
 }
diff --git a/src/Http/Http.Features/src/PublicAPI.Unshipped.txt b/src/Http/Http.Features/src/PublicAPI.Unshipped.txt
@@ -1,5 +1,5 @@
 #nullable enable
 Microsoft.AspNetCore.Http.Features.IHttpConnectFeature
-Microsoft.AspNetCore.Http.Features.IHttpConnectFeature.AcceptAsync() -> System.Threading.Tasks.Task<System.IO.Stream!>!
+Microsoft.AspNetCore.Http.Features.IHttpConnectFeature.AcceptAsync() -> System.Threading.Tasks.ValueTask<System.IO.Stream!>
 Microsoft.AspNetCore.Http.Features.IHttpConnectFeature.IsConnectRequest.get -> bool
-Microsoft.AspNetCore.Http.Features.IHttpConnectFeature.Protocol.get -> string!
+Microsoft.AspNetCore.Http.Features.IHttpConnectFeature.Protocol.get -> string?
diff --git a/src/Middleware/WebSockets/src/WebSocketMiddleware.cs b/src/Middleware/WebSockets/src/WebSocketMiddleware.cs
@@ -6,7 +6,6 @@
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
-using Microsoft.AspNetCore.Server.Kestrel.Core.Features;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Microsoft.Extensions.Primitives;

diff --git a/src/Middleware/WebSockets/test/UnitTests/Http2WebSocketTests.cs b/src/Middleware/WebSockets/test/UnitTests/Http2WebSocketTests.cs
@@ -61,14 +61,14 @@ public sealed class ConnectFeature : IHttpConnectFeature
         public Stream Stream { get; set; } = Stream.Null;
 
         /// <inheritdoc/>
-        public Task<Stream> AcceptAsync()
+        public ValueTask<Stream> AcceptAsync()
         {
             if (!IsConnectRequest)
             {
                 throw new InvalidOperationException("This is not a CONNECT request.");
             }
 
-            return Task.FromResult(Stream);
+            return new ValueTask<Stream>(Stream);
         }
     }
 }
diff --git a/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs b/src/Servers/Kestrel/Core/src/Internal/Http/HttpProtocol.FeatureCollection.cs
@@ -288,7 +288,7 @@ async Task<Stream> IHttpUpgradeFeature.UpgradeAsync()
         return _bodyControl!.Upgrade();
     }
 
-    async Task<Stream> IHttpConnectFeature.AcceptAsync()
+    async ValueTask<Stream> IHttpConnectFeature.AcceptAsync()
     {
         if (!IsConnectRequest)
         {