Merge branch 'master' into scope_work

2024-05-19 16:58:14 +00:00 · 2023-12-21 19:20:49 -08:00 · 2023-12-21 19:20:49 -08:00 · f82e740776
parent d6ee2779cd ede0201aa4
commit f82e740776
29 changed files with 53 additions and 46 deletions
--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@ -13,7 +13,6 @@

 #![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))]
--- a/actix-http-test/src/lib.rs
+++ b/actix-http-test/src/lib.rs
@ -2,7 +2,6 @@

 #![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))]
--- a/actix-http/CHANGES.md
+++ b/actix-http/CHANGES.md
@ -5,6 +5,7 @@
 ### Changed

 - Updated `zstd` dependency to `0.13`.
+- Implemented `From<HeaderMap>` for `http::HeaderMap`.

 ### Fixed

--- a/actix-http/Cargo.toml
+++ b/actix-http/Cargo.toml
@ -5,7 +5,7 @@ authors = [
    "Nikolay Kim <fafhrd91@gmail.com>",
    "Rob Ede <robjtede@icloud.com>",
 ]
-description = "HTTP primitives for the Actix ecosystem"
+description = "HTTP types and services for the Actix ecosystem"
 keywords = ["actix", "http", "framework", "async", "futures"]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web"
--- a/actix-http/README.md
+++ b/actix-http/README.md
@ -1,6 +1,8 @@
-# actix-http
+# `actix-http`

-> HTTP primitives for the Actix ecosystem.
+> HTTP types and services for the Actix ecosystem.
+
+<!-- prettier-ignore-start -->

 [![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.4.0)](https://docs.rs/actix-http/3.4.0)
@ -11,12 +13,14 @@
 [![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)

+<!-- prettier-ignore-end -->
+
 ## Documentation & Resources

 - [API Documentation](https://docs.rs/actix-http)
 - Minimum Supported Rust Version (MSRV): 1.68

-## Example
+## Examples

 ```rust
 use std::{env, io};
--- a/actix-http/benches/response-body-compression.rs
+++ b/actix-http/benches/response-body-compression.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::convert::Infallible;

 use actix_http::{encoding::Encoder, ContentEncoding, Request, Response, StatusCode};
--- a/actix-http/src/header/map.rs
+++ b/actix-http/src/header/map.rs
@ -636,10 +636,17 @@ impl<'a> IntoIterator for &'a HeaderMap {
    }
 }

-/// Convert `http::HeaderMap` to our `HeaderMap`.
+/// Convert a `http::HeaderMap` to our `HeaderMap`.
 impl From<http::HeaderMap> for HeaderMap {
-    fn from(mut map: http::HeaderMap) -> HeaderMap {
-        HeaderMap::from_drain(map.drain())
+    fn from(mut map: http::HeaderMap) -> Self {
+        Self::from_drain(map.drain())
+    }
+}
+
+/// Convert our `HeaderMap` to a `http::HeaderMap`.
+impl From<HeaderMap> for http::HeaderMap {
+    fn from(map: HeaderMap) -> Self {
+        Self::from_iter(map)
    }
 }

--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@ -1,6 +1,7 @@
-//! HTTP primitives for the Actix ecosystem.
+//! HTTP types and services for the Actix ecosystem.
 //!
 //! ## Crate Features
+//!
 //! | Feature             | Functionality                               |
 //! | ------------------- | ------------------------------------------- |
 //! | `http2`             | HTTP/2 support via [h2].                    |
@ -21,8 +22,7 @@
 #![allow(
    clippy::type_complexity,
    clippy::too_many_arguments,
-    clippy::borrow_interior_mutable_const,
-    clippy::uninlined_format_args
+    clippy::borrow_interior_mutable_const
 )]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
--- a/actix-http/tests/test_openssl.rs
+++ b/actix-http/tests/test_openssl.rs
@ -1,5 +1,4 @@
 #![cfg(feature = "openssl")]
-#![allow(clippy::uninlined_format_args)]

 extern crate tls_openssl as openssl;

--- a/actix-http/tests/test_ws.rs
+++ b/actix-http/tests/test_ws.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::{
    cell::Cell,
    convert::Infallible,
--- a/actix-multipart-derive/README.md
+++ b/actix-multipart-derive/README.md
@ -3,11 +3,11 @@
 > 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)
+[![Documentation](https://docs.rs/actix-multipart-derive/badge.svg?version=0.6.1)](https://docs.rs/actix-multipart-derive/0.6.1)
 ![Version](https://img.shields.io/badge/rustc-1.68+-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)
+[![dependency status](https://deps.rs/crate/actix-multipart-derive/0.6.1/status.svg)](https://deps.rs/crate/actix-multipart-derive/0.6.1)
 [![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)

--- a/actix-multipart/src/lib.rs
+++ b/actix-multipart/src/lib.rs
@ -2,7 +2,7 @@

 #![deny(rust_2018_idioms, nonstandard_style)]
 #![warn(future_incompatible)]
-#![allow(clippy::borrow_interior_mutable_const, clippy::uninlined_format_args)]
+#![allow(clippy::borrow_interior_mutable_const)]
 #![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))]
--- a/actix-router/README.md
+++ b/actix-router/README.md
@ -0,0 +1,16 @@
+# `actix-router`
+
+[![crates.io](https://img.shields.io/crates/v/actix-router?label=latest)](https://crates.io/crates/actix-router)
+[![Documentation](https://docs.rs/actix-router/badge.svg?version=0.5.1)](https://docs.rs/actix-router/0.5.1)
+![Version](https://img.shields.io/badge/rustc-1.68+-ab6000.svg)
+![MIT or Apache 2.0 licensed](https://img.shields.io/crates/l/actix-router.svg)
+<br />
+[![dependency status](https://deps.rs/crate/actix-router/0.5.1/status.svg)](https://deps.rs/crate/actix-router/0.5.1)
+[![Download](https://img.shields.io/crates/d/actix-router.svg)](https://crates.io/crates/actix-router)
+[![Chat on Discord](https://img.shields.io/discord/771444961383153695?label=chat&logo=discord)](https://discord.gg/NWpN5mmg3x)
+
+<!-- cargo-rdme start -->
+
+Resource path matching and router.
+
+<!-- cargo-rdme end -->
--- a/actix-router/benches/quoter.rs
+++ b/actix-router/benches/quoter.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::{borrow::Cow, fmt::Write as _};

 use criterion::{black_box, criterion_group, criterion_main, Criterion};
--- a/actix-router/src/lib.rs
+++ b/actix-router/src/lib.rs
@ -2,7 +2,6 @@

 #![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))]
--- a/actix-router/src/resource.rs
+++ b/actix-router/src/resource.rs
@ -193,8 +193,8 @@ const REGEX_FLAGS: &str = "(?s-m)";
 /// # Trailing Slashes
 /// It should be noted that this library takes no steps to normalize intra-path or trailing slashes.
 /// As such, all resource definitions implicitly expect a pre-processing step to normalize paths if
-/// they you wish to accommodate "recoverable" path errors. Below are several examples of
-/// resource-path pairs that would not be compatible.
+/// you wish to accommodate "recoverable" path errors. Below are several examples of resource-path
+/// pairs that would not be compatible.
 ///
 /// ## Examples
 /// ```
--- a/actix-router/src/router.rs
+++ b/actix-router/src/router.rs
@ -97,6 +97,7 @@ impl<T, U> RouterBuilder<T, U> {
        ctx: U,
    ) -> (&mut ResourceDef, &mut T, &mut U) {
        self.routes.push((rdef, val, ctx));
+        #[allow(clippy::map_identity)] // map is used to distribute &mut-ness to tuple elements
        self.routes
            .last_mut()
            .map(|(rdef, val, ctx)| (rdef, val, ctx))
@ -186,11 +187,11 @@ mod tests {
        assert_eq!(path.get("file").unwrap(), "file");
        assert_eq!(path.get("ext").unwrap(), "gz");

-        let mut path = Path::new("/vtest/ttt/index.html");
+        let mut path = Path::new("/v2/ttt/index.html");
        let (h, info) = router.recognize_mut(&mut path).unwrap();
        assert_eq!(*h, 14);
        assert_eq!(info, ResourceId(4));
-        assert_eq!(path.get("val").unwrap(), "test");
+        assert_eq!(path.get("val").unwrap(), "2");
        assert_eq!(path.get("val2").unwrap(), "ttt");

        let mut path = Path::new("/v/blah-blah/index.html");
--- a/actix-web-actors/src/lib.rs
+++ b/actix-web-actors/src/lib.rs
@ -57,7 +57,6 @@

 #![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))]
--- a/actix-web/Cargo.toml
+++ b/actix-web/Cargo.toml
@ -15,7 +15,7 @@ categories = [
 ]
 homepage = "https://actix.rs"
 repository = "https://github.com/actix/actix-web"
-license = "MIT OR Apache-2.0"
+license.workspace = true
 edition.workspace = true
 rust-version.workspace = true

--- a/actix-web/benches/server.rs
+++ b/actix-web/benches/server.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use actix_web::{web, App, HttpResponse};
 use awc::Client;
 use criterion::{criterion_group, criterion_main, Criterion};
--- a/actix-web/examples/macroless.rs
+++ b/actix-web/examples/macroless.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use actix_web::{middleware, rt, web, App, HttpRequest, HttpServer};

 async fn index(req: HttpRequest) -> &'static str {
--- a/actix-web/examples/uds.rs
+++ b/actix-web/examples/uds.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use actix_web::{get, web, HttpRequest};
 #[cfg(unix)]
 use actix_web::{middleware, App, Error, HttpResponse, HttpServer};
--- a/actix-web/src/lib.rs
+++ b/actix-web/src/lib.rs
@ -69,7 +69,6 @@

 #![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))]
--- a/actix-web/src/redirect.rs
+++ b/actix-web/src/redirect.rs
@ -171,7 +171,7 @@ impl Responder for Redirect {
        } else {
            log::error!(
                "redirect target location can not be converted to header value: {:?}",
-                self.to
+                self.to,
            );
        }

--- a/actix-web/tests/test_httpserver.rs
+++ b/actix-web/tests/test_httpserver.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 #[cfg(feature = "openssl")]
 extern crate tls_openssl as openssl;

--- a/awc/examples/client.rs
+++ b/awc/examples/client.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::error::Error as StdError;

 #[tokio::main]
--- a/awc/src/lib.rs
+++ b/awc/src/lib.rs
@ -105,8 +105,7 @@
 #![allow(
    clippy::type_complexity,
    clippy::borrow_interior_mutable_const,
-    clippy::needless_doctest_main,
-    clippy::uninlined_format_args
+    clippy::needless_doctest_main
 )]
 #![doc(html_logo_url = "https://actix.rs/img/logo.png")]
 #![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
--- a/awc/tests/test_client.rs
+++ b/awc/tests/test_client.rs
@ -1,5 +1,3 @@
-#![allow(clippy::uninlined_format_args)]
-
 use std::{
    collections::HashMap,
    convert::Infallible,
--- a/scripts/bump
+++ b/scripts/bump
@ -93,9 +93,12 @@ fi

 # done; remove backup files
 rm -f $CARGO_MANIFEST.bak
-rm -f $CHANGELOG_FILE.bak
 rm -f $README_FILE.bak

+if [ -n "${CHANGELOG_FILE-}" ]; then
+    rm -f $CHANGELOG_FILE.bak
+fi
+
 echo "manifest, changelog, and readme updated"
 echo
 echo "check other references:"