Merge branch 'master' into master

hyperium · Aug 14, 2024 · 3166eeb · 3166eeb
2 parents 55721ef + ad89b53
commit 3166eeb
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/capi/include/hyper.h b/capi/include/hyper.h
@@ -538,7 +538,7 @@ void hyper_waker_free(struct hyper_waker *waker);
 void hyper_waker_wake(struct hyper_waker *waker);
 
 #ifdef __cplusplus
-} // extern "C"
-#endif // __cplusplus
+}  // extern "C"
+#endif  // __cplusplus
 
-#endif /* _HYPER_H */
+#endif  /* _HYPER_H */
diff --git a/src/proto/h2/client.rs b/src/proto/h2/client.rs
@@ -722,6 +722,9 @@ where
                 }
 
                 Poll::Pending => match ready!(Pin::new(&mut self.conn_eof).poll(cx)) {
+                    // As of Rust 1.82, this pattern is no longer needed, and emits a waring.
+                    // But we cannot remove it as long as MSRV is less than that.
+                    #[allow(unused)]
                     Ok(never) => match never {},
                     Err(_conn_is_eof) => {
                         trace!("connection task is closed, closing dispatch task");