Merge remote-tracking branch 'origin/master' into remove-extensions-from-head

src/error/internal.rs

@@ -128,7 +128,7 @@ macro_rules! error_helper {
                 InternalError::new(err, StatusCode::$status).into()
             }
         }
-    }
+    };
 }
 
 error_helper!(ErrorBadRequest, BAD_REQUEST);

src/error/mod.rs

@@ -1,8 +1,9 @@
 //! Error and Result module
-
-/// This is meant to be a glob import of the whole error module, but rustdoc can't handle
-/// shadowing `Error` type, so it is expanded manually.
-/// See https://github.com/rust-lang/rust/issues/83375
+// This is meant to be a glob import of the whole error module except for `Error`. Rustdoc can't yet
+// correctly resolve the conflicting `Error` type defined in this module, so these re-exports are
+// expanded manually.
+//
+// See <https://github.com/rust-lang/rust/issues/83375>
 pub use actix_http::error::{
     BlockingError, ContentTypeError, DispatchError, HttpError, ParseError, PayloadError,
 };

src/lib.rs

@@ -65,6 +65,7 @@
 //! * `secure-cookies` - secure cookies support
 
 #![deny(rust_2018_idioms, nonstandard_style)]
+#![warn(future_incompatible)]
 #![allow(clippy::needless_doctest_main, clippy::type_complexity)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]

src/request.rs

@@ -173,7 +173,7 @@ impl HttpRequest {
     /// let opt_t = req.conn_data::<PeerCertificate>();
     /// ```
     ///
-    /// [on-connect]: crate::HttpServiceBuilder::on_connect_ext
+    /// [on-connect]: crate::HttpServer::on_connect
     pub fn conn_data<T: 'static>(&self) -> Option<&T> {
         self.inner
             .conn_data

src/response/builder.rs

@@ -109,6 +109,7 @@ impl HttpResponseBuilder {
     }
 
     /// Replaced with [`Self::insert_header()`].
+    #[doc(hidden)]
     #[deprecated(
         since = "4.0.0",
         note = "Replaced with `insert_header((key, value))`. Will be removed in v5."
@@ -133,6 +134,7 @@ impl HttpResponseBuilder {
     }
 
     /// Replaced with [`Self::append_header()`].
+    #[doc(hidden)]
     #[deprecated(
         since = "4.0.0",
         note = "Replaced with `append_header((key, value))`. Will be removed in v5."