Merge branch 'master' into impl-downcast-for-message-body

actix-http/src/client/pool.rs

@@ -17,6 +17,7 @@ use h2::client::{handshake, Connection, SendRequest};
 use http::uri::Authority;
 use indexmap::IndexSet;
 use slab::Slab;
+use pin_project::pin_project;
 
 use super::connection::{ConnectionType, IoConnection};
 use super::error::ConnectError;
@@ -422,6 +423,7 @@ where
     }
 }
 
+#[pin_project]
 struct ConnectorPoolSupport<T, Io>
 where
     Io: AsyncRead + AsyncWrite + Unpin + 'static,
@@ -439,7 +441,7 @@ where
     type Output = ();
 
     fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
-        let this = unsafe { self.get_unchecked_mut() };
+        let this = self.project();
 
         let mut inner = this.inner.as_ref().borrow_mut();
         inner.waker.register(cx.waker());

src/lib.rs

@@ -7,6 +7,12 @@
 //! Actix web is a small, pragmatic, and extremely fast web framework
 //! for Rust.
 //!
+//! ## Example
+//!
+//! The `#[actix_rt::main]` macro in the example below is provided by the Actix runtime
+//! crate, [`actix-rt`](https://crates.io/crates/actix-rt). You will need to include
+//! `actix-rt` in your dependencies for it to run.
+//!
 //! ```rust,no_run
 //! use actix_web::{web, App, Responder, HttpServer};
 //!

src/server.rs

@@ -443,8 +443,6 @@ where
 
     #[cfg(unix)]
     /// Start listening for unix domain connections on existing listener.
-    ///
-    /// This method is available with `uds` feature.
     pub fn listen_uds(
         mut self,
         lst: std::os::unix::net::UnixListener,
@@ -483,8 +481,6 @@ where
 
     #[cfg(unix)]
     /// Start listening for incoming unix domain connections.
-    ///
-    /// This method is available with `uds` feature.
     pub fn bind_uds<A>(mut self, addr: A) -> io::Result<Self>
     where
         A: AsRef<std::path::Path>,