feat(server): add initial window builder methods that take self by-val

The current `Builder` methods `http2_initial_stream_window_size` and `http2_initial_connection_window_size` take `&mut self`, while every other builder method takes `self`. That breaks up the chaining of options. This patch adds two methods that configure the same option, but take `self` instead, and have an underscore suffix (so, `http2_initial_stream_window_size_`). cc #1814
hyperium · May 16, 2019 · 89a0e36 · 89a0e36
1 parent 973f981
commit 89a0e36
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 9 deletions.
diff --git a/benches/end_to_end.rs b/benches/end_to_end.rs
@@ -235,14 +235,11 @@ fn spawn_hello(rt: &mut Runtime, opts: &Opts) -> SocketAddr {
     let addr = "127.0.0.1:0".parse().unwrap();
 
     let body = opts.response_body;
-    let mut builder = Server::bind(&addr)
+    let srv = Server::bind(&addr)
         .http2_only(opts.http2);
-    // api woopsie
-    builder
-        .http2_initial_stream_window_size(opts.http2_stream_window)
-        .http2_initial_connection_window_size(opts.http2_conn_window);
-
-    let srv = builder.serve(move || {
+        .http2_initial_stream_window_size_(opts.http2_stream_window)
+        .http2_initial_connection_window_size_(opts.http2_conn_window)
+        .serve(move || {
             service_fn(move |req: Request<Body>| {
                 req
                     .into_body()

diff --git a/src/server/mod.rs b/src/server/mod.rs
@@ -302,21 +302,37 @@ impl<I, E> Builder<I, E> {
         self
     }
 
+    // soft-deprecated? deprecation warning just seems annoying...
+    // reimplemented to take `self` instead of `&mut self`
+    #[doc(hidden)]
+    pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
+        self.protocol.http2_initial_stream_window_size(sz.into());
+        self
+    }
+
+    // soft-deprecated? deprecation warning just seems annoying...
+    // reimplemented to take `self` instead of `&mut self`
+    #[doc(hidden)]
+    pub fn http2_initial_connection_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
+        self.protocol.http2_initial_connection_window_size(sz.into());
+        self
+    }
+
     /// Sets the [`SETTINGS_INITIAL_WINDOW_SIZE`][spec] option for HTTP2
     /// stream-level flow control.
     ///
     /// Default is 65,535
     ///
     /// [spec]: https://http2.github.io/http2-spec/#SETTINGS_INITIAL_WINDOW_SIZE
-    pub fn http2_initial_stream_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
+    pub fn http2_initial_stream_window_size_(mut self, sz: impl Into<Option<u32>>) -> Self {
         self.protocol.http2_initial_stream_window_size(sz.into());
         self
     }
 
     /// Sets the max connection-level flow control for HTTP2
     ///
     /// Default is 65,535
-    pub fn http2_initial_connection_window_size(&mut self, sz: impl Into<Option<u32>>) -> &mut Self {
+    pub fn http2_initial_connection_window_size_(mut self, sz: impl Into<Option<u32>>) -> Self {
         self.protocol.http2_initial_connection_window_size(sz.into());
         self
     }