prepare actix-http release 3.3.1

fix http version req
add resource method helpers (#2978 )
2025-07-16 22:55:47 +02:00 · 2023-03-02 17:09:26 +00:00 · 2023-03-02 16:21:13 +00:00 · 2023-03-02 08:22:22 +00:00 · 2023-02-26 21:55:25 +00:00 · 2023-02-26 21:45:36 +00:00
41 changed files with 126 additions and 64 deletions
--- a/actix-files/CHANGES.md
+++ b/actix-files/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx

 ## 0.6.3 - 2023-01-21

--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@@ -14,6 +14,9 @@
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible, missing_docs, missing_debug_implementations)]
 #![allow(clippy::uninlined_format_args)]
+#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
+#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 use actix_service::boxed::{BoxService, BoxServiceFactory};
 use actix_web::{
--- a/actix-http-test/CHANGES.md
+++ b/actix-http-test/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx

 ## 3.1.0 - 2023-01-21

--- a/actix-http-test/Cargo.toml
+++ b/actix-http-test/Cargo.toml
@@ -39,7 +39,7 @@ awc = { version = "3", default-features = false }

 bytes = "1"
 futures-core = { version = "0.3.17", default-features = false }
-http = "0.2.5"
+http = "0.2.7"
 log = "0.4"
 socket2 = "0.4"
 serde = "1.0"
--- a/actix-http-test/src/lib.rs
+++ b/actix-http-test/src/lib.rs
@@ -5,6 +5,7 @@
 #![allow(clippy::uninlined_format_args)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 #[cfg(feature = "openssl")]
 extern crate tls_openssl as openssl;
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@@ -1,6 +1,12 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx
+
+## 3.3.1 - 2023-03-02
+
+### Fixed
+
+- Use correct `http` version requirement to ensure support for const `HeaderName` definitions.

 ## 3.3.0 - 2023-01-21

--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-http"
-version = "3.3.0"
+version = "3.3.1"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "Rob Ede <robjtede@icloud.com>",
@@ -68,7 +68,7 @@ bytestring = "1"
 derive_more = "0.99.5"
 encoding_rs = "0.8"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
-http = "0.2.5"
+http = "0.2.7"
 httparse = "1.5.1"
 httpdate = "1.0.1"
 itoa = "1"
--- a/actix-http/README.md
+++ b/actix-http/README.md
@@ -3,11 +3,11 @@
 > HTTP primitives for the Actix ecosystem.

 [![crates.io](https://img.shields.io/crates/v/actix-http?label=latest)](https://crates.io/crates/actix-http)
-[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.3.0)](https://docs.rs/actix-http/3.3.0)
+[![Documentation](https://docs.rs/actix-http/badge.svg?version=3.3.1)](https://docs.rs/actix-http/3.3.1)
 ![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-http.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-http/3.3.0/status.svg)](https://deps.rs/crate/actix-http/3.3.0)
+[![dependency status](https://deps.rs/crate/actix-http/3.3.1/status.svg)](https://deps.rs/crate/actix-http/3.3.1)
 [![Download](https://img.shields.io/crates/d/actix-http.svg)](https://crates.io/crates/actix-http)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

--- a/actix-http/src/builder.rs
+++ b/actix-http/src/builder.rs
@@ -211,7 +211,6 @@ where

    /// Finish service configuration and create a service for the HTTP/2 protocol.
    #[cfg(feature = "http2")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
    pub fn h2<F, B>(self, service: F) -> crate::h2::H2Service<T, S, B>
    where
        F: IntoServiceFactory<S, Request>,
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -294,7 +294,6 @@ impl std::error::Error for PayloadError {
            PayloadError::Overflow => None,
            PayloadError::UnknownLength => None,
            #[cfg(feature = "http2")]
-            #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
            PayloadError::Http2Payload(err) => Some(err),
            PayloadError::Io(err) => Some(err),
        }
@@ -352,7 +351,6 @@ pub enum DispatchError {
    /// HTTP/2 error.
    #[display(fmt = "{}", _0)]
    #[cfg(feature = "http2")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
    H2(h2::Error),

    /// The first request did not complete within the specified timeout.
--- a/actix-http/src/h1/service.rs
+++ b/actix-http/src/h1/service.rs
@@ -134,7 +134,6 @@ mod openssl {
        U::InitError: fmt::Debug,
    {
        /// Create OpenSSL based service.
-        #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
        pub fn openssl(
            self,
            acceptor: SslAcceptor,
@@ -197,7 +196,6 @@ mod rustls {
        U::InitError: fmt::Debug,
    {
        /// Create Rustls based service.
-        #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
        pub fn rustls(
            self,
            config: ServerConfig,
--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@@ -117,7 +117,6 @@ mod openssl {
        B: MessageBody + 'static,
    {
        /// Create OpenSSL based service.
-        #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
        pub fn openssl(
            self,
            acceptor: SslAcceptor,
@@ -165,7 +164,6 @@ mod rustls {
        B: MessageBody + 'static,
    {
        /// Create Rustls based service.
-        #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
        pub fn rustls(
            self,
            mut config: ServerConfig,
--- a/actix-http/src/header/common.rs
+++ b/actix-http/src/header/common.rs
@@ -8,12 +8,14 @@ use http::header::HeaderName;
 /// request.
 ///
 /// See [RFC 9211](https://www.rfc-editor.org/rfc/rfc9211) for full semantics.
+// TODO(breaking): replace with http's version
 pub const CACHE_STATUS: HeaderName = HeaderName::from_static("cache-status");

 /// Response header field that allows origin servers to control the behavior of CDN caches
 /// interposed between them and clients separately from other caches that might handle the response.
 ///
 /// See [RFC 9213](https://www.rfc-editor.org/rfc/rfc9213) for full semantics.
+// TODO(breaking): replace with http's version
 pub const CDN_CACHE_CONTROL: HeaderName = HeaderName::from_static("cdn-cache-control");

 /// Response header that prevents a document from loading any cross-origin resources that don't
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -26,7 +26,7 @@
 )]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 pub use ::http::{uri, uri::Uri};
 pub use ::http::{Method, StatusCode, Version};
@@ -41,7 +41,6 @@ pub mod error;
 mod extensions;
 pub mod h1;
 #[cfg(feature = "http2")]
-#[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
 pub mod h2;
 pub mod header;
 mod helpers;
@@ -56,7 +55,6 @@ mod responses;
 mod service;
 pub mod test;
 #[cfg(feature = "ws")]
-#[cfg_attr(docsrs, doc(cfg(feature = "ws")))]
 pub mod ws;

 pub use self::builder::HttpServiceBuilder;
@@ -74,7 +72,6 @@ pub use self::requests::{Request, RequestHead, RequestHeadType};
 pub use self::responses::{Response, ResponseBuilder, ResponseHead};
 pub use self::service::HttpService;
 #[cfg(any(feature = "openssl", feature = "rustls"))]
-#[cfg_attr(docsrs, doc(cfg(any(feature = "openssl", feature = "rustls"))))]
 pub use self::service::TlsAcceptorConfig;

 /// A major HTTP protocol version.
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@@ -217,7 +217,6 @@ where
    /// Creates TCP stream service from HTTP service that automatically selects HTTP/1.x or HTTP/2
    /// on plaintext connections.
    #[cfg(feature = "http2")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "http2")))]
    pub fn tcp_auto_h2c(
        self,
    ) -> impl ServiceFactory<
@@ -253,7 +252,6 @@ where

 /// Configuration options used when accepting TLS connection.
 #[cfg(any(feature = "openssl", feature = "rustls"))]
-#[cfg_attr(docsrs, doc(cfg(any(feature = "openssl", feature = "rustls"))))]
 #[derive(Debug, Default)]
 pub struct TlsAcceptorConfig {
    pub(crate) handshake_timeout: Option<std::time::Duration>,
@@ -309,7 +307,6 @@ mod openssl {
        U::InitError: fmt::Debug,
    {
        /// Create OpenSSL based service.
-        #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
        pub fn openssl(
            self,
            acceptor: SslAcceptor,
@@ -324,7 +321,6 @@ mod openssl {
        }

        /// Create OpenSSL based service with custom TLS acceptor configuration.
-        #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
        pub fn openssl_with_config(
            self,
            acceptor: SslAcceptor,
@@ -404,7 +400,6 @@ mod rustls {
        U::InitError: fmt::Debug,
    {
        /// Create Rustls based service.
-        #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
        pub fn rustls(
            self,
            config: ServerConfig,
@@ -419,7 +414,6 @@ mod rustls {
        }

        /// Create Rustls based service with custom TLS acceptor configuration.
-        #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
        pub fn rustls_with_config(
            self,
            mut config: ServerConfig,
--- a/actix-multipart-derive/CHANGES.md
+++ b/actix-multipart-derive/CHANGES.md
@@ -0,0 +1,5 @@
+# Changes
+
+## 0.6.0 - 2023-02-26
+
+- Add `MultipartForm` derive macro.
--- a/actix-multipart-derive/Cargo.toml
+++ b/actix-multipart-derive/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-multipart-derive"
-version = "0.5.0"
+version = "0.6.0"
 authors = ["Jacob Halsey <jacob@jhalsey.com>"]
 description = "Multipart form derive macro for Actix Web"
 keywords = ["http", "web", "framework", "async", "futures"]
@@ -9,6 +9,10 @@ repository = "https://github.com/actix/actix-web.git"
 license = "MIT OR Apache-2.0"
 edition = "2018"

+[package.metadata.docs.rs]
+rustdoc-args = ["--cfg", "docsrs"]
+all-features = true
+
 [lib]
 proc-macro = true

@@ -20,7 +24,7 @@ quote = "1"
 syn = "1"

 [dev-dependencies]
-actix-multipart = "0.5"
+actix-multipart = "0.6"
 actix-web = "4"
 rustversion = "1"
 trybuild = "1"
--- a/actix-multipart-derive/README.md
+++ b/actix-multipart-derive/README.md
@@ -1,3 +1,17 @@
 # actix-multipart-derive

-> The derive macro implementation for actix-multipart.
+> The derive macro implementation for actix-multipart-derive.
+
+[![crates.io](https://img.shields.io/crates/v/actix-multipart-derive?label=latest)](https://crates.io/crates/actix-multipart-derive)
+[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.5.0)](https://docs.rs/actix-multipart-derive/0.5.0)
+![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
+![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart-derive.svg)
+<br />
+[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.5.0/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.5.0)
+[![Download](https://img.shields.io/crates/d/actix-multipart-derive.svg)](https://crates.io/crates/actix-multipart-derive)
+[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
+
+## Documentation & Resources
+
+- [API Documentation](https://docs.rs/actix-multipart-derive)
+- Minimum Supported Rust Version (MSRV): 1.59
--- a/actix-multipart-derive/src/lib.rs
+++ b/actix-multipart-derive/src/lib.rs
@@ -6,7 +6,7 @@
 #![warn(future_incompatible)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 use std::{collections::HashSet, convert::TryFrom as _};

--- a/actix-multipart/CHANGES.md
+++ b/actix-multipart/CHANGES.md
@@ -1,6 +1,8 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx
+
+## 0.6.0 - 2023-02-26

 - Added `MultipartForm` typed data extractor. [#2883]

--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "actix-multipart"
-version = "0.5.0"
+version = "0.6.0"
 authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "Jacob Halsey <jacob@jhalsey.com>",
@@ -21,12 +21,8 @@ default = ["tempfile", "derive"]
 derive = ["actix-multipart-derive"]
 tempfile = ["tempfile-dep", "tokio/fs"]

-[lib]
-name = "actix_multipart"
-path = "src/lib.rs"
-
 [dependencies]
-actix-multipart-derive = { version = "=0.5.0", optional = true }
+actix-multipart-derive = { version = "=0.6.0", optional = true }
 actix-utils = "3"
 actix-web = { version = "4", default-features = false }

--- a/actix-multipart/README.md
+++ b/actix-multipart/README.md
@@ -3,11 +3,11 @@
 > Multipart form support for Actix Web.

 [![crates.io](https://img.shields.io/crates/v/actix-multipart?label=latest)](https://crates.io/crates/actix-multipart)
-[![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.5.0)](https://docs.rs/actix-multipart/0.5.0)
+[![Documentation](https://docs.rs/actix-multipart/badge.svg?version=0.6.0)](https://docs.rs/actix-multipart/0.6.0)
 ![Version](https://img.shields.io/badge/rustc-1.59+-ab6000.svg)
 ![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-multipart.svg)
 <br />
-[![dependency status](https://deps.rs/crate/actix-multipart/0.5.0/status.svg)](https://deps.rs/crate/actix-multipart/0.5.0)
+[![dependency status](https://deps.rs/crate/actix-multipart/0.6.0/status.svg)](https://deps.rs/crate/actix-multipart/0.6.0)
 [![Download](https://img.shields.io/crates/d/actix-multipart.svg)](https://crates.io/crates/actix-multipart)
 [![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)

--- a/actix-multipart/src/form/mod.rs
+++ b/actix-multipart/src/form/mod.rs
@@ -16,12 +16,10 @@ use crate::{Field, Multipart, MultipartError};

 pub mod bytes;
 pub mod json;
-#[cfg_attr(docsrs, doc(cfg(feature = "tempfile")))]
 #[cfg(feature = "tempfile")]
 pub mod tempfile;
 pub mod text;

-#[cfg_attr(docsrs, doc(cfg(feature = "derive")))]
 #[cfg(feature = "derive")]
 pub use actix_multipart_derive::MultipartForm;

--- a/actix-multipart/src/lib.rs
+++ b/actix-multipart/src/lib.rs
@@ -3,7 +3,9 @@
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible)]
 #![allow(clippy::borrow_interior_mutable_const, clippy::uninlined_format_args)]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
+#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 // This allows us to use the actix_multipart_derive within this crate's tests
 #[cfg(test)]
--- a/actix-router/CHANGES.md
+++ b/actix-router/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx

 ## 0.5.1 - 2022-09-19

--- a/actix-router/Cargo.toml
+++ b/actix-router/Cargo.toml
@@ -21,14 +21,14 @@ default = ["http"]

 [dependencies]
 bytestring = ">=0.1.5, <2"
-http = { version = "0.2.5", optional = true }
+http = { version = "0.2.7", optional = true }
 regex = "1.5"
 serde = "1"
 tracing = { version = "0.1.30", default-features = false, features = ["log"] }

 [dev-dependencies]
 criterion = { version = "0.4", features = ["html_reports"] }
-http = "0.2.5"
+http = "0.2.7"
 serde = { version = "1", features = ["derive"] }
 percent-encoding = "2.1"

--- a/actix-router/src/lib.rs
+++ b/actix-router/src/lib.rs
@@ -5,6 +5,7 @@
 #![allow(clippy::uninlined_format_args)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 mod de;
 mod path;
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx

 ## 0.1.1 - 2023-02-26

--- a/actix-test/src/lib.rs
+++ b/actix-test/src/lib.rs
@@ -28,6 +28,9 @@

 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible)]
+#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
+#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 #[cfg(feature = "openssl")]
 extern crate tls_openssl as openssl;
--- a/actix-web-actors/CHANGES.md
+++ b/actix-web-actors/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx

 ## 4.2.0 - 2023-01-21

--- a/actix-web-actors/src/lib.rs
+++ b/actix-web-actors/src/lib.rs
@@ -58,6 +58,9 @@
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible)]
 #![allow(clippy::uninlined_format_args)]
+#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
+#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 mod context;
 pub mod ws;
--- a/actix-web-codegen/CHANGES.md
+++ b/actix-web-codegen/CHANGES.md
@@ -1,6 +1,6 @@
 # Changes

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx

 ## 4.2.0 - 2023-02-26

--- a/actix-web-codegen/src/lib.rs
+++ b/actix-web-codegen/src/lib.rs
@@ -75,6 +75,9 @@
 #![recursion_limit = "512"]
 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible)]
+#![doc(html_logo_url = "https://actix.rs/img/logo.png")]
+#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 use proc_macro::TokenStream;
 use quote::quote;
--- a/actix-web/CHANGES.md
+++ b/actix-web/CHANGES.md
@@ -1,6 +1,8 @@
 # Changelog

-## Unreleased - 2022-xx-xx
+## Unreleased - 2023-xx-xx
+
+- Add `Resource::{get, post, etc...}` methods for more concisely adding routes that don't need additional guards.

 ## 4.3.1 - 2023-02-26

--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@@ -81,7 +81,6 @@ derive_more = "0.99.8"
 encoding_rs = "0.8"
 futures-core = { version = "0.3.17", default-features = false }
 futures-util = { version = "0.3.17", default-features = false }
-http = "0.2.8"
 itoa = "1"
 language-tags = "0.3"
 log = "0.4"
--- a/actix-web/src/lib.rs
+++ b/actix-web/src/lib.rs
@@ -72,7 +72,7 @@
 #![allow(clippy::uninlined_format_args)]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
-#![cfg_attr(docsrs, feature(doc_cfg))]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 mod app;
 mod app_service;
@@ -119,14 +119,12 @@ pub use crate::types::Either;
 pub use actix_http::{body, HttpMessage};

 #[cfg(feature = "cookies")]
-#[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
 #[doc(inline)]
 pub use cookie;

 macro_rules! codegen_reexport {
    ($name:ident) => {
        #[cfg(feature = "macros")]
-        #[cfg_attr(docsrs, doc(cfg(feature = "macros")))]
        pub use actix_web_codegen::$name;
    };
 }
--- a/actix-web/src/request.rs
+++ b/actix-web/src/request.rs
@@ -311,7 +311,6 @@ impl HttpRequest {

    /// Load request cookies.
    #[cfg(feature = "cookies")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
    pub fn cookies(&self) -> Result<Ref<'_, Vec<Cookie<'static>>>, CookieParseError> {
        use actix_http::header::COOKIE;

@@ -335,7 +334,6 @@ impl HttpRequest {

    /// Return request cookie.
    #[cfg(feature = "cookies")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "cookies")))]
    pub fn cookie(&self, name: &str) -> Option<Cookie<'static>> {
        if let Ok(cookies) = self.cookies() {
            for cookie in cookies.iter() {
--- a/actix-web/src/resource.rs
+++ b/actix-web/src/resource.rs
@@ -21,7 +21,7 @@ use crate::{
        BoxedHttpService, BoxedHttpServiceFactory, HttpServiceFactory, ServiceRequest,
        ServiceResponse,
    },
-    Error, FromRequest, HttpResponse, Responder,
+    web, Error, FromRequest, HttpResponse, Responder,
 };

 /// A collection of [`Route`]s that respond to the same path pattern.
@@ -38,11 +38,13 @@ use crate::{
 ///
 /// let app = App::new().service(
 ///     web::resource("/")
-///         .route(web::get().to(|| HttpResponse::Ok())));
+///         .get(|| HttpResponse::Ok())
+///         .post(|| async { "Hello World!" })
+/// );
 /// ```
 ///
-/// If no matching route is found, [a 405 response is returned with an appropriate Allow header][RFC
-/// 9110 §15.5.6]. This default behavior can be overridden using
+/// If no matching route is found, an empty 405 response is returned which includes an
+/// [appropriate Allow header][RFC 9110 §15.5.6]. This default behavior can be overridden using
 /// [`default_service()`](Self::default_service).
 ///
 /// [RFC 9110 §15.5.6]: https://www.rfc-editor.org/rfc/rfc9110.html#section-15.5.6
@@ -58,6 +60,7 @@ pub struct Resource<T = ResourceEndpoint> {
 }

 impl Resource {
+    /// Constructs new resource that matches a `path` pattern.
    pub fn new<T: IntoPatterns>(path: T) -> Resource {
        let fref = Rc::new(RefCell::new(None));

@@ -368,6 +371,45 @@ where
    }
 }

+macro_rules! route_shortcut {
+    ($method_fn:ident, $method_upper:literal) => {
+        #[doc = concat!(" Adds a ", $method_upper, " route.")]
+        ///
+        /// Use [`route`](Self::route) if you need to add additional guards.
+        ///
+        /// # Examples
+        ///
+        /// ```
+        /// # use actix_web::web;
+        /// web::resource("/")
+        #[doc = concat!("    .", stringify!($method_fn), "(|| async { \"Hello World!\" })")]
+        /// # ;
+        /// ```
+        pub fn $method_fn<F, Args>(self, handler: F) -> Self
+        where
+            F: Handler<Args>,
+            Args: FromRequest + 'static,
+            F::Output: Responder + 'static,
+        {
+            self.route(web::$method_fn().to(handler))
+        }
+    };
+}
+
+/// Concise routes for well-known HTTP methods.
+impl<T> Resource<T>
+where
+    T: ServiceFactory<ServiceRequest, Config = (), Error = Error, InitError = ()>,
+{
+    route_shortcut!(get, "GET");
+    route_shortcut!(post, "POST");
+    route_shortcut!(put, "PUT");
+    route_shortcut!(patch, "PATCH");
+    route_shortcut!(delete, "DELETE");
+    route_shortcut!(head, "HEAD");
+    route_shortcut!(trace, "TRACE");
+}
+
 impl<T, B> HttpServiceFactory for Resource<T>
 where
    T: ServiceFactory<
--- a/actix-web/src/server.rs
+++ b/actix-web/src/server.rs
@@ -217,7 +217,6 @@ where
    ///
    /// By default handshake timeout is set to 3000 milliseconds.
    #[cfg(any(feature = "openssl", feature = "rustls"))]
-    #[cfg_attr(docsrs, doc(cfg(any(feature = "openssl", feature = "rustls"))))]
    pub fn tls_handshake_timeout(self, dur: Duration) -> Self {
        self.config
            .lock()
@@ -382,7 +381,6 @@ where
    ///
    /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
    #[cfg(feature = "rustls")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
    pub fn bind_rustls<A: net::ToSocketAddrs>(
        mut self,
        addrs: A,
@@ -402,7 +400,6 @@ where
    ///
    /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
    #[cfg(feature = "openssl")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
    pub fn bind_openssl<A>(mut self, addrs: A, builder: SslAcceptorBuilder) -> io::Result<Self>
    where
        A: net::ToSocketAddrs,
@@ -469,7 +466,6 @@ where
    ///
    /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
    #[cfg(feature = "rustls")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "rustls")))]
    pub fn listen_rustls(
        self,
        lst: net::TcpListener,
@@ -535,7 +531,6 @@ where
    ///
    /// ALPN protocols "h2" and "http/1.1" are added to any configured ones.
    #[cfg(feature = "openssl")]
-    #[cfg_attr(docsrs, doc(cfg(feature = "openssl")))]
    pub fn listen_openssl(
        self,
        lst: net::TcpListener,
--- a/awc/Cargo.toml
+++ b/awc/Cargo.toml
@@ -69,7 +69,7 @@ derive_more = "0.99.5"
 futures-core = { version = "0.3.17", default-features = false, features = ["alloc"] }
 futures-util = { version = "0.3.17", default-features = false, features = ["alloc", "sink"] }
 h2 = "0.3.9"
-http = "0.2.5"
+http = "0.2.7"
 itoa = "1"
 log =" 0.4"
 mime = "0.3"
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@@ -110,6 +110,7 @@
 )]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
+#![cfg_attr(docsrs, feature(doc_auto_cfg))]

 pub use actix_http::body;
Author	SHA1	Message	Date
Rob Ede	e0939a01fc	prepare actix-http release 3.3.1	2023-03-02 17:09:26 +00:00
Rob Ede	20c7c07dc0	fix http version req	2023-03-02 16:21:13 +00:00
Rob Ede	d7c6774ad5	add resource method helpers (#2978 )	2023-03-02 08:22:22 +00:00
Rob Ede	67efa4a4db	migrate to doc_auto_cfg	2023-02-26 21:55:25 +00:00
Rob Ede	d77bcb0b7c	update date in unreleased changelog sections	2023-02-26 21:45:36 +00:00
Rob Ede	c4db9a1ae2	prepare actix-multipart release 0.6.0	2023-02-26 21:44:57 +00:00
Rob Ede	740d0c0c9d	prepare actix-multipart-derive release 0.6.0	2023-02-26 21:44:14 +00:00
Rob Ede	f27584046c	add todo for header names in next breaking release	2023-02-26 16:31:40 +00:00