diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..1a54090f0
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,12 @@
+version: 2
+updates:
+ - package-ecosystem: "cargo"
+ directory: "/"
+ schedule:
+ interval: "monthly"
+ open-pull-requests-limit: 10
+ - package-ecosystem: "github-actions"
+ directory: "/"
+ schedule:
+ interval: "monthly"
+ open-pull-requests-limit: 10
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index 8dd941e04..d293fea95 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -26,39 +26,26 @@ jobs:
name: ${{ matrix.target.name }} / ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}
- env:
- CI: 1
- CARGO_INCREMENTAL: 0
- VCPKGRS_DYNAMIC: 1
- CARGO_UNSTABLE_SPARSE_REGISTRY: true
-
steps:
- uses: actions/checkout@v3
- # install OpenSSL on Windows
- # TODO: GitHub actions docs state that OpenSSL is
- # already installed on these Windows machines somewhere
- - name: Set vcpkg root
- if: matrix.target.triple == 'x86_64-pc-windows-msvc'
- run: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Install OpenSSL
- if: matrix.target.triple == 'x86_64-pc-windows-msvc'
- run: vcpkg install openssl:x64-windows
-
- - name: Install ${{ matrix.version }}
+ if: matrix.target.os == 'windows-latest'
+ run: choco install openssl -y --forcex64 --no-progress
+ - name: Set OpenSSL dir in env
+ if: matrix.target.os == 'windows-latest'
run: |
- rustup set profile minimal
- rustup install ${{ matrix.version }}
- rustup override set ${{ matrix.version }}
+ echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
+ echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append
+
+ - name: Install Rust (${{ matrix.version }})
+ uses: actions-rust-lang/setup-rust-toolchain@v1
+ with:
+ toolchain: ${{ matrix.version }}
- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
- - name: Generate Cargo.lock
- run: cargo generate-lockfile
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v2.2.1
-
- name: check minimal
run: cargo ci-check-min
@@ -88,23 +75,15 @@ jobs:
name: Verify Feature Combinations
runs-on: ubuntu-latest
- env:
- CI: 1
- CARGO_INCREMENTAL: 0
-
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@stable
+ - name: Install Rust
+ uses: actions-rust-lang/setup-rust-toolchain@v1
- name: Install cargo-hack
uses: taiki-e/install-action@cargo-hack
- - name: Generate Cargo.lock
- run: cargo generate-lockfile
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v2.2.1
-
- name: check feature combinations
run: cargo ci-check-all-feature-powerset
@@ -115,22 +94,14 @@ jobs:
name: nextest
runs-on: ubuntu-latest
- env:
- CI: 1
- CARGO_INCREMENTAL: 0
-
steps:
- uses: actions/checkout@v3
- - uses: dtolnay/rust-toolchain@stable
+ - name: Install Rust
+ uses: actions-rust-lang/setup-rust-toolchain@v1
- name: Install nextest
uses: taiki-e/install-action@nextest
- - name: Generate Cargo.lock
- run: cargo generate-lockfile
- - name: Cache Dependencies
- uses: Swatinem/rust-cache@v2.2.1
-
- name: Test with cargo-nextest
run: cargo nextest run
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 10e80b751..f85548505 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,17 +29,17 @@ jobs:
name: ${{ matrix.target.name }} / ${{ matrix.version }}
runs-on: ${{ matrix.target.os }}
- env: {}
-
steps:
- uses: actions/checkout@v3
- name: Install OpenSSL
if: matrix.target.os == 'windows-latest'
- run: choco install openssl
+ run: choco install openssl -y --forcex64 --no-progress
- name: Set OpenSSL dir in env
if: matrix.target.os == 'windows-latest'
- run: echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
+ run: |
+ echo 'OPENSSL_DIR=C:\Program Files\OpenSSL-Win64' | Out-File -FilePath $env:GITHUB_ENV -Append
+ echo 'OPENSSL_DIR=C:\Program Files\OpenSSL' | Out-File -FilePath $env:GITHUB_ENV -Append
- name: Install Rust (${{ matrix.version }})
uses: actions-rust-lang/setup-rust-toolchain@v1
diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml
index d537031c3..42f16450d 100644
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -29,5 +29,6 @@ jobs:
cargo install cargo-tarpaulin --vers "^0.13"
cargo tarpaulin --workspace --features=rustls,openssl --out Xml --verbose
- name: Upload to Codecov
- uses: codecov/codecov-action@v1
- with: { file: cobertura.xml }
+ uses: codecov/codecov-action@v3.1.4
+ with:
+ file: cobertura.xml
diff --git a/.github/workflows/upload-doc.yml b/.github/workflows/upload-doc.yml
index 743e14412..05b81411d 100644
--- a/.github/workflows/upload-doc.yml
+++ b/.github/workflows/upload-doc.yml
@@ -32,7 +32,7 @@ jobs:
run: echo '' > target/doc/index.html
- name: Deploy to GitHub Pages
- uses: JamesIves/github-pages-deploy-action@v4.4.1
+ uses: JamesIves/github-pages-deploy-action@v4.4.3
with:
folder: target/doc
single-commit: true
diff --git a/.rustfmt.toml b/.rustfmt.toml
new file mode 100644
index 000000000..71b9be3ae
--- /dev/null
+++ b/.rustfmt.toml
@@ -0,0 +1,3 @@
+group_imports = "StdExternalCrate"
+imports_granularity = "Crate"
+use_field_init_shorthand = true
diff --git a/actix-files/src/chunked.rs b/actix-files/src/chunked.rs
index 241b4dccb..c6c019038 100644
--- a/actix-files/src/chunked.rs
+++ b/actix-files/src/chunked.rs
@@ -7,11 +7,10 @@ use std::{
};
use actix_web::{error::Error, web::Bytes};
-use futures_core::{ready, Stream};
-use pin_project_lite::pin_project;
-
#[cfg(feature = "experimental-io-uring")]
use bytes::BytesMut;
+use futures_core::{ready, Stream};
+use pin_project_lite::pin_project;
use super::named::File;
diff --git a/actix-files/src/directory.rs b/actix-files/src/directory.rs
index 3af53a31a..6ade424b9 100644
--- a/actix-files/src/directory.rs
+++ b/actix-files/src/directory.rs
@@ -1,4 +1,9 @@
-use std::{fmt::Write, fs::DirEntry, io, path::Path, path::PathBuf};
+use std::{
+ fmt::Write,
+ fs::DirEntry,
+ io,
+ path::{Path, PathBuf},
+};
use actix_web::{dev::ServiceResponse, HttpRequest, HttpResponse};
use percent_encoding::{utf8_percent_encode, CONTROLS};
diff --git a/actix-files/src/files.rs b/actix-files/src/files.rs
index be2a450d2..e34b5f26a 100644
--- a/actix-files/src/files.rs
+++ b/actix-files/src/files.rs
@@ -8,8 +8,7 @@ use std::{
use actix_service::{boxed, IntoServiceFactory, ServiceFactory, ServiceFactoryExt};
use actix_web::{
dev::{
- AppService, HttpServiceFactory, RequestHead, ResourceDef, ServiceRequest,
- ServiceResponse,
+ AppService, HttpServiceFactory, RequestHead, ResourceDef, ServiceRequest, ServiceResponse,
},
error::Error,
guard::Guard,
@@ -301,12 +300,8 @@ impl Files {
pub fn default_handler(mut self, f: F) -> Self
where
F: IntoServiceFactory,
- U: ServiceFactory<
- ServiceRequest,
- Config = (),
- Response = ServiceResponse,
- Error = Error,
- > + 'static,
+ U: ServiceFactory
+ + 'static,
{
// create and configure default resource
self.default = Rc::new(RefCell::new(Some(Rc::new(boxed::factory(
@@ -422,10 +417,14 @@ mod tests {
assert_eq!(res.status(), StatusCode::OK);
let body = test::read_body(res).await;
+ let body_str = std::str::from_utf8(&body).unwrap();
+ let actual_path = Path::new(&body_str);
+ let expected_path = Path::new("actix-files/tests");
assert!(
- body.ends_with(b"actix-files/tests/"),
- "body {:?} does not end with `actix-files/tests/`",
- body
+ actual_path.ends_with(expected_path),
+ "body {:?} does not end with {:?}",
+ actual_path,
+ expected_path
);
}
}
diff --git a/actix-files/src/lib.rs b/actix-files/src/lib.rs
index bed8194c8..1d8609889 100644
--- a/actix-files/src/lib.rs
+++ b/actix-files/src/lib.rs
@@ -18,6 +18,8 @@
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
+use std::path::Path;
+
use actix_service::boxed::{BoxService, BoxServiceFactory};
use actix_web::{
dev::{RequestHead, ServiceRequest, ServiceResponse},
@@ -25,7 +27,6 @@ use actix_web::{
http::header::DispositionType,
};
use mime_guess::from_ext;
-use std::path::Path;
mod chunked;
mod directory;
@@ -37,16 +38,15 @@ mod path_buf;
mod range;
mod service;
-pub use self::chunked::ChunkedReadFile;
-pub use self::directory::Directory;
-pub use self::files::Files;
-pub use self::named::NamedFile;
-pub use self::range::HttpRange;
-pub use self::service::FilesService;
-
-use self::directory::{directory_listing, DirectoryRenderer};
-use self::error::FilesError;
-use self::path_buf::PathBufWrap;
+pub use self::{
+ chunked::ChunkedReadFile, directory::Directory, files::Files, named::NamedFile,
+ range::HttpRange, service::FilesService,
+};
+use self::{
+ directory::{directory_listing, DirectoryRenderer},
+ error::FilesError,
+ path_buf::PathBufWrap,
+};
type HttpService = BoxService;
type HttpNewService = BoxServiceFactory<(), ServiceRequest, ServiceResponse, Error, ()>;
@@ -554,10 +554,9 @@ mod tests {
#[actix_rt::test]
async fn test_static_files_with_spaces() {
- let srv = test::init_service(
- App::new().service(Files::new("/", ".").index_file("Cargo.toml")),
- )
- .await;
+ let srv =
+ test::init_service(App::new().service(Files::new("/", ".").index_file("Cargo.toml")))
+ .await;
let request = TestRequest::get()
.uri("/tests/test%20space.binary")
.to_request();
@@ -667,8 +666,7 @@ mod tests {
#[actix_rt::test]
async fn test_static_files() {
let srv =
- test::init_service(App::new().service(Files::new("/", ".").show_files_listing()))
- .await;
+ test::init_service(App::new().service(Files::new("/", ".").show_files_listing())).await;
let req = TestRequest::with_uri("/missing").to_request();
let resp = test::call_service(&srv, req).await;
@@ -681,8 +679,7 @@ mod tests {
assert_eq!(resp.status(), StatusCode::NOT_FOUND);
let srv =
- test::init_service(App::new().service(Files::new("/", ".").show_files_listing()))
- .await;
+ test::init_service(App::new().service(Files::new("/", ".").show_files_listing())).await;
let req = TestRequest::with_uri("/tests").to_request();
let resp = test::call_service(&srv, req).await;
assert_eq!(
diff --git a/actix-files/src/named.rs b/actix-files/src/named.rs
index c10bc00ed..d7795ba73 100644
--- a/actix-files/src/named.rs
+++ b/actix-files/src/named.rs
@@ -8,13 +8,13 @@ use std::{
use actix_web::{
body::{self, BoxBody, SizedStream},
dev::{
- self, AppService, HttpServiceFactory, ResourceDef, Service, ServiceFactory,
- ServiceRequest, ServiceResponse,
+ self, AppService, HttpServiceFactory, ResourceDef, Service, ServiceFactory, ServiceRequest,
+ ServiceResponse,
},
http::{
header::{
- self, Charset, ContentDisposition, ContentEncoding, DispositionParam,
- DispositionType, ExtendedValue, HeaderValue,
+ self, Charset, ContentDisposition, ContentEncoding, DispositionParam, DispositionType,
+ ExtendedValue, HeaderValue,
},
StatusCode,
},
@@ -85,6 +85,7 @@ pub struct NamedFile {
#[cfg(not(feature = "experimental-io-uring"))]
pub(crate) use std::fs::File;
+
#[cfg(feature = "experimental-io-uring")]
pub(crate) use tokio_uring::fs::File;
@@ -139,8 +140,7 @@ impl NamedFile {
_ => DispositionType::Attachment,
};
- let mut parameters =
- vec![DispositionParam::Filename(String::from(filename.as_ref()))];
+ let mut parameters = vec![DispositionParam::Filename(String::from(filename.as_ref()))];
if !filename.is_ascii() {
parameters.push(DispositionParam::FilenameExt(ExtendedValue {
diff --git a/actix-files/src/range.rs b/actix-files/src/range.rs
index 65c680ede..528911ae0 100644
--- a/actix-files/src/range.rs
+++ b/actix-files/src/range.rs
@@ -48,8 +48,8 @@ impl HttpRange {
/// `header` is HTTP Range header (e.g. `bytes=bytes=0-9`).
/// `size` is full size of response (file).
pub fn parse(header: &str, size: u64) -> Result, ParseRangeErr> {
- let ranges = http_range::HttpRange::parse(header, size)
- .map_err(|err| ParseRangeErr(err.into()))?;
+ let ranges =
+ http_range::HttpRange::parse(header, size).map_err(|err| ParseRangeErr(err.into()))?;
Ok(ranges
.iter()
diff --git a/actix-files/src/service.rs b/actix-files/src/service.rs
index d94fd5850..3d3b36c40 100644
--- a/actix-files/src/service.rs
+++ b/actix-files/src/service.rs
@@ -62,11 +62,7 @@ impl FilesService {
}
}
- fn serve_named_file(
- &self,
- req: ServiceRequest,
- mut named_file: NamedFile,
- ) -> ServiceResponse {
+ fn serve_named_file(&self, req: ServiceRequest, mut named_file: NamedFile) -> ServiceResponse {
if let Some(ref mime_override) = self.mime_override {
let new_disposition = mime_override(&named_file.content_type.type_());
named_file.content_disposition.disposition = new_disposition;
@@ -120,13 +116,11 @@ impl Service for FilesService {
));
}
- let path_on_disk = match PathBufWrap::parse_path(
- req.match_info().unprocessed(),
- this.hidden_files,
- ) {
- Ok(item) => item,
- Err(err) => return Ok(req.error_response(err)),
- };
+ let path_on_disk =
+ match PathBufWrap::parse_path(req.match_info().unprocessed(), this.hidden_files) {
+ Ok(item) => item,
+ Err(err) => return Ok(req.error_response(err)),
+ };
if let Some(filter) = &this.path_filter {
if !filter(path_on_disk.as_ref(), req.head()) {
@@ -177,8 +171,7 @@ impl Service for FilesService {
match NamedFile::open_async(&path).await {
Ok(mut named_file) => {
if let Some(ref mime_override) = this.mime_override {
- let new_disposition =
- mime_override(&named_file.content_type.type_());
+ let new_disposition = mime_override(&named_file.content_type.type_());
named_file.content_disposition.disposition = new_disposition;
}
named_file.flags = this.file_flags;
diff --git a/actix-files/tests/encoding.rs b/actix-files/tests/encoding.rs
index 7aec25ff9..3c8bdb59b 100644
--- a/actix-files/tests/encoding.rs
+++ b/actix-files/tests/encoding.rs
@@ -24,8 +24,7 @@ async fn test_utf8_file_contents() {
// disable UTF-8 attribute
let srv =
- test::init_service(App::new().service(Files::new("/", "./tests").prefer_utf8(false)))
- .await;
+ test::init_service(App::new().service(Files::new("/", "./tests").prefer_utf8(false))).await;
let req = TestRequest::with_uri("/utf8.txt").to_request();
let res = test::call_service(&srv, req).await;
diff --git a/actix-files/tests/guard.rs b/actix-files/tests/guard.rs
index d053f3fdc..5a97f75d6 100644
--- a/actix-files/tests/guard.rs
+++ b/actix-files/tests/guard.rs
@@ -12,9 +12,7 @@ async fn test_guard_filter() {
let srv = test::init_service(
App::new()
.service(Files::new("/", "./tests/fixtures/guards/first").guard(Host("first.com")))
- .service(
- Files::new("/", "./tests/fixtures/guards/second").guard(Host("second.com")),
- ),
+ .service(Files::new("/", "./tests/fixtures/guards/second").guard(Host("second.com"))),
)
.await;
diff --git a/actix-files/tests/traversal.rs b/actix-files/tests/traversal.rs
index c890b3fe4..4eecb8dde 100644
--- a/actix-files/tests/traversal.rs
+++ b/actix-files/tests/traversal.rs
@@ -9,8 +9,7 @@ use actix_web::{
async fn test_directory_traversal_prevention() {
let srv = test::init_service(App::new().service(Files::new("/", "./tests"))).await;
- let req =
- TestRequest::with_uri("/../../../../../../../../../../../etc/passwd").to_request();
+ let req = TestRequest::with_uri("/../../../../../../../../../../../etc/passwd").to_request();
let res = test::call_service(&srv, req).await;
assert_eq!(res.status(), StatusCode::NOT_FOUND);
diff --git a/actix-http/examples/hello-world.rs b/actix-http/examples/hello-world.rs
index c749cdd00..cf10beddf 100644
--- a/actix-http/examples/hello-world.rs
+++ b/actix-http/examples/hello-world.rs
@@ -23,10 +23,7 @@ async fn main() -> io::Result<()> {
res.insert_header(("x-head", HeaderValue::from_static("dummy value!")));
let forty_two = req.conn_data::().unwrap().to_string();
- res.insert_header((
- "x-forty-two",
- HeaderValue::from_str(&forty_two).unwrap(),
- ));
+ res.insert_header(("x-forty-two", HeaderValue::from_str(&forty_two).unwrap()));
Ok::<_, Infallible>(res.body("Hello world!"))
})
diff --git a/actix-http/src/body/boxed.rs b/actix-http/src/body/boxed.rs
index 2bbb75369..0151ff3a5 100644
--- a/actix-http/src/body/boxed.rs
+++ b/actix-http/src/body/boxed.rs
@@ -77,12 +77,8 @@ impl MessageBody for BoxBody {
cx: &mut Context<'_>,
) -> Poll>> {
match &mut self.0 {
- BoxBodyInner::None(body) => {
- Pin::new(body).poll_next(cx).map_err(|err| match err {})
- }
- BoxBodyInner::Bytes(body) => {
- Pin::new(body).poll_next(cx).map_err(|err| match err {})
- }
+ BoxBodyInner::None(body) => Pin::new(body).poll_next(cx).map_err(|err| match err {}),
+ BoxBodyInner::Bytes(body) => Pin::new(body).poll_next(cx).map_err(|err| match err {}),
BoxBodyInner::Stream(body) => Pin::new(body).poll_next(cx),
}
}
diff --git a/actix-http/src/body/mod.rs b/actix-http/src/body/mod.rs
index d1708b9d5..1a12f3336 100644
--- a/actix-http/src/body/mod.rs
+++ b/actix-http/src/body/mod.rs
@@ -14,12 +14,14 @@ mod size;
mod sized_stream;
mod utils;
-pub use self::body_stream::BodyStream;
-pub use self::boxed::BoxBody;
-pub use self::either::EitherBody;
-pub use self::message_body::MessageBody;
pub(crate) use self::message_body::MessageBodyMapErr;
-pub use self::none::None;
-pub use self::size::BodySize;
-pub use self::sized_stream::SizedStream;
-pub use self::utils::{to_bytes, to_bytes_limited, BodyLimitExceeded};
+pub use self::{
+ body_stream::BodyStream,
+ boxed::BoxBody,
+ either::EitherBody,
+ message_body::MessageBody,
+ none::None,
+ size::BodySize,
+ sized_stream::SizedStream,
+ utils::{to_bytes, to_bytes_limited, BodyLimitExceeded},
+};
diff --git a/actix-http/src/config.rs b/actix-http/src/config.rs
index c0d297a20..b3b215da4 100644
--- a/actix-http/src/config.rs
+++ b/actix-http/src/config.rs
@@ -132,15 +132,15 @@ impl ServiceConfig {
#[cfg(test)]
mod tests {
- use super::*;
- use crate::{date::DATE_VALUE_LENGTH, notify_on_drop};
-
use actix_rt::{
task::yield_now,
time::{sleep, sleep_until},
};
use memchr::memmem;
+ use super::*;
+ use crate::{date::DATE_VALUE_LENGTH, notify_on_drop};
+
#[actix_rt::test]
async fn test_date_service_update() {
let settings =
diff --git a/actix-http/src/encoding/decoder.rs b/actix-http/src/encoding/decoder.rs
index 06b672fd8..e9aba25e7 100644
--- a/actix-http/src/encoding/decoder.rs
+++ b/actix-http/src/encoding/decoder.rs
@@ -9,11 +9,9 @@ use std::{
use actix_rt::task::{spawn_blocking, JoinHandle};
use bytes::Bytes;
-use futures_core::{ready, Stream};
-
#[cfg(feature = "compress-gzip")]
use flate2::write::{GzDecoder, ZlibDecoder};
-
+use futures_core::{ready, Stream};
#[cfg(feature = "compress-zstd")]
use zstd::stream::write::Decoder as ZstdDecoder;
@@ -49,9 +47,9 @@ where
))),
#[cfg(feature = "compress-gzip")]
- ContentEncoding::Deflate => Some(ContentDecoder::Deflate(Box::new(
- ZlibDecoder::new(Writer::new()),
- ))),
+ ContentEncoding::Deflate => Some(ContentDecoder::Deflate(Box::new(ZlibDecoder::new(
+ Writer::new(),
+ )))),
#[cfg(feature = "compress-gzip")]
ContentEncoding::Gzip => Some(ContentDecoder::Gzip(Box::new(GzDecoder::new(
diff --git a/actix-http/src/encoding/encoder.rs b/actix-http/src/encoding/encoder.rs
index bbe53e8e8..527bfebaa 100644
--- a/actix-http/src/encoding/encoder.rs
+++ b/actix-http/src/encoding/encoder.rs
@@ -11,12 +11,10 @@ use std::{
use actix_rt::task::{spawn_blocking, JoinHandle};
use bytes::Bytes;
use derive_more::Display;
-use futures_core::ready;
-use pin_project_lite::pin_project;
-
#[cfg(feature = "compress-gzip")]
use flate2::write::{GzEncoder, ZlibEncoder};
-
+use futures_core::ready;
+use pin_project_lite::pin_project;
use tracing::trace;
#[cfg(feature = "compress-zstd")]
use zstd::stream::write::Encoder as ZstdEncoder;
diff --git a/actix-http/src/encoding/mod.rs b/actix-http/src/encoding/mod.rs
index d51dd66c0..7823f3979 100644
--- a/actix-http/src/encoding/mod.rs
+++ b/actix-http/src/encoding/mod.rs
@@ -7,8 +7,7 @@ use bytes::{Bytes, BytesMut};
mod decoder;
mod encoder;
-pub use self::decoder::Decoder;
-pub use self::encoder::Encoder;
+pub use self::{decoder::Decoder, encoder::Encoder};
/// Special-purpose writer for streaming (de-)compression.
///
diff --git a/actix-http/src/error.rs b/actix-http/src/error.rs
index fa0228a50..fbd2eb7ae 100644
--- a/actix-http/src/error.rs
+++ b/actix-http/src/error.rs
@@ -3,12 +3,11 @@
use std::{error::Error as StdError, fmt, io, str::Utf8Error, string::FromUtf8Error};
use derive_more::{Display, Error, From};
+pub use http::Error as HttpError;
use http::{uri::InvalidUri, StatusCode};
use crate::{body::BoxBody, Response};
-pub use http::Error as HttpError;
-
pub struct Error {
inner: Box,
}
diff --git a/actix-http/src/h1/codec.rs b/actix-http/src/h1/codec.rs
index e1b629146..8dae2e43e 100644
--- a/actix-http/src/h1/codec.rs
+++ b/actix-http/src/h1/codec.rs
@@ -9,9 +9,7 @@ use super::{
decoder::{self, PayloadDecoder, PayloadItem, PayloadType},
encoder, Message, MessageType,
};
-use crate::{
- body::BodySize, error::ParseError, ConnectionType, Request, Response, ServiceConfig,
-};
+use crate::{body::BodySize, error::ParseError, ConnectionType, Request, Response, ServiceConfig};
bitflags! {
#[derive(Debug, Clone, Copy)]
diff --git a/actix-http/src/h1/decoder.rs b/actix-http/src/h1/decoder.rs
index 829f40e10..9e9b253d6 100644
--- a/actix-http/src/h1/decoder.rs
+++ b/actix-http/src/h1/decoder.rs
@@ -94,9 +94,7 @@ pub(crate) trait MessageType: Sized {
// SAFETY: httparse already checks header value is only visible ASCII bytes
// from_maybe_shared_unchecked contains debug assertions so they are omitted here
let value = unsafe {
- HeaderValue::from_maybe_shared_unchecked(
- slice.slice(idx.value.0..idx.value.1),
- )
+ HeaderValue::from_maybe_shared_unchecked(slice.slice(idx.value.0..idx.value.1))
};
match name {
@@ -275,8 +273,7 @@ impl MessageType for Request {
let mut msg = Request::new();
// convert headers
- let mut length =
- msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
+ let mut length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
// disallow HTTP/1.0 POST requests that do not contain a Content-Length headers
// see https://datatracker.ietf.org/doc/html/rfc1945#section-7.2.2
@@ -356,8 +353,8 @@ impl MessageType for ResponseHead {
Version::HTTP_10
};
- let status = StatusCode::from_u16(res.code.unwrap())
- .map_err(|_| ParseError::Status)?;
+ let status =
+ StatusCode::from_u16(res.code.unwrap()).map_err(|_| ParseError::Status)?;
HeaderIndex::record(src, res.headers, &mut headers);
(len, version, status, res.headers.len())
@@ -378,8 +375,7 @@ impl MessageType for ResponseHead {
msg.version = ver;
// convert headers
- let mut length =
- msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
+ let mut length = msg.set_headers(&src.split_to(len).freeze(), &headers[..h_len], ver)?;
// Remove CL value if 0 now that all headers and HTTP/1.0 special cases are processed.
// Protects against some request smuggling attacks.
diff --git a/actix-http/src/h1/dispatcher.rs b/actix-http/src/h1/dispatcher.rs
index c2f8ea453..270707807 100644
--- a/actix-http/src/h1/dispatcher.rs
+++ b/actix-http/src/h1/dispatcher.rs
@@ -19,14 +19,6 @@ use tokio::io::{AsyncRead, AsyncWrite};
use tokio_util::codec::{Decoder as _, Encoder as _};
use tracing::{error, trace};
-use crate::{
- body::{BodySize, BoxBody, MessageBody},
- config::ServiceConfig,
- error::{DispatchError, ParseError, PayloadError},
- service::HttpFlow,
- Error, Extensions, OnConnectData, Request, Response, StatusCode,
-};
-
use super::{
codec::Codec,
decoder::MAX_BUFFER_SIZE,
@@ -34,6 +26,13 @@ use super::{
timer::TimerState,
Message, MessageType,
};
+use crate::{
+ body::{BodySize, BoxBody, MessageBody},
+ config::ServiceConfig,
+ error::{DispatchError, ParseError, PayloadError},
+ service::HttpFlow,
+ Error, Extensions, OnConnectData, Request, Response, StatusCode,
+};
const LW_BUFFER_SIZE: usize = 1024;
const HW_BUFFER_SIZE: usize = 1024 * 8;
@@ -213,9 +212,7 @@ where
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
match self {
Self::None => write!(f, "State::None"),
- Self::ExpectCall { .. } => {
- f.debug_struct("State::ExpectCall").finish_non_exhaustive()
- }
+ Self::ExpectCall { .. } => f.debug_struct("State::ExpectCall").finish_non_exhaustive(),
Self::ServiceCall { .. } => {
f.debug_struct("State::ServiceCall").finish_non_exhaustive()
}
@@ -276,9 +273,7 @@ where
head_timer: TimerState::new(config.client_request_deadline().is_some()),
ka_timer: TimerState::new(config.keep_alive().enabled()),
- shutdown_timer: TimerState::new(
- config.client_disconnect_deadline().is_some(),
- ),
+ shutdown_timer: TimerState::new(config.client_disconnect_deadline().is_some()),
io: Some(io),
read_buf: BytesMut::with_capacity(HW_BUFFER_SIZE),
@@ -456,9 +451,7 @@ where
}
// return with upgrade request and poll it exclusively
- Some(DispatcherMessage::Upgrade(req)) => {
- return Ok(PollResponse::Upgrade(req))
- }
+ Some(DispatcherMessage::Upgrade(req)) => return Ok(PollResponse::Upgrade(req)),
// all messages are dealt with
None => {
@@ -675,9 +668,7 @@ where
}
_ => {
- unreachable!(
- "State must be set to ServiceCall or ExceptCall in handle_request"
- )
+ unreachable!("State must be set to ServiceCall or ExceptCall in handle_request")
}
}
}
@@ -686,10 +677,7 @@ where
/// Process one incoming request.
///
/// Returns true if any meaningful work was done.
- fn poll_request(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- ) -> Result {
+ fn poll_request(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result {
let pipeline_queue_full = self.messages.len() >= MAX_PIPELINED_MESSAGES;
let can_not_read = !self.can_read(cx);
@@ -859,10 +847,7 @@ where
Ok(())
}
- fn poll_ka_timer(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- ) -> Result<(), DispatchError> {
+ fn poll_ka_timer(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result<(), DispatchError> {
let this = self.as_mut().project();
if let TimerState::Active { timer } = this.ka_timer {
debug_assert!(
@@ -927,10 +912,7 @@ where
}
/// Poll head, keep-alive, and disconnect timer.
- fn poll_timers(
- mut self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- ) -> Result<(), DispatchError> {
+ fn poll_timers(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result<(), DispatchError> {
self.as_mut().poll_head_timer(cx)?;
self.as_mut().poll_ka_timer(cx)?;
self.as_mut().poll_shutdown_timer(cx)?;
@@ -944,10 +926,7 @@ where
/// - `std::io::ErrorKind::ConnectionReset` after partial read;
/// - all data read done.
#[inline(always)] // TODO: bench this inline
- fn read_available(
- self: Pin<&mut Self>,
- cx: &mut Context<'_>,
- ) -> Result {
+ fn read_available(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Result {
let this = self.project();
if this.flags.contains(Flags::READ_DISCONNECT) {
diff --git a/actix-http/src/h1/dispatcher_tests.rs b/actix-http/src/h1/dispatcher_tests.rs
index db46cdefc..50259e6ce 100644
--- a/actix-http/src/h1/dispatcher_tests.rs
+++ b/actix-http/src/h1/dispatcher_tests.rs
@@ -1,14 +1,11 @@
use std::{future::Future, str, task::Poll, time::Duration};
-use actix_rt::{pin, time::sleep};
-use actix_service::fn_service;
-use actix_utils::future::{ready, Ready};
-use bytes::Bytes;
-use futures_util::future::lazy;
-
use actix_codec::Framed;
-use actix_service::Service;
-use bytes::{Buf, BytesMut};
+use actix_rt::{pin, time::sleep};
+use actix_service::{fn_service, Service};
+use actix_utils::future::{ready, Ready};
+use bytes::{Buf, Bytes, BytesMut};
+use futures_util::future::lazy;
use super::dispatcher::{Dispatcher, DispatcherState, DispatcherStateProj, Flags};
use crate::{
@@ -43,8 +40,8 @@ fn status_service(
fn_service(move |_req: Request| ready(Ok::<_, Error>(Response::new(status))))
}
-fn echo_path_service(
-) -> impl Service, Error = Error> {
+fn echo_path_service() -> impl Service, Error = Error>
+{
fn_service(|req: Request| {
let path = req.path().as_bytes();
ready(Ok::<_, Error>(
@@ -53,8 +50,8 @@ fn echo_path_service(
})
}
-fn drop_payload_service(
-) -> impl Service, Error = Error> {
+fn drop_payload_service() -> impl Service, Error = Error>
+{
fn_service(|mut req: Request| async move {
let _ = req.take_payload();
Ok::<_, Error>(Response::with_body(StatusCode::OK, "payload dropped"))
diff --git a/actix-http/src/h1/mod.rs b/actix-http/src/h1/mod.rs
index 858cf542a..9e44608d8 100644
--- a/actix-http/src/h1/mod.rs
+++ b/actix-http/src/h1/mod.rs
@@ -17,14 +17,16 @@ mod timer;
mod upgrade;
mod utils;
-pub use self::client::{ClientCodec, ClientPayloadCodec};
-pub use self::codec::Codec;
-pub use self::dispatcher::Dispatcher;
-pub use self::expect::ExpectHandler;
-pub use self::payload::Payload;
-pub use self::service::{H1Service, H1ServiceHandler};
-pub use self::upgrade::UpgradeHandler;
-pub use self::utils::SendResponse;
+pub use self::{
+ client::{ClientCodec, ClientPayloadCodec},
+ codec::Codec,
+ dispatcher::Dispatcher,
+ expect::ExpectHandler,
+ payload::Payload,
+ service::{H1Service, H1ServiceHandler},
+ upgrade::UpgradeHandler,
+ utils::SendResponse,
+};
#[derive(Debug)]
/// Codec message
diff --git a/actix-http/src/h1/service.rs b/actix-http/src/h1/service.rs
index 9eebe2126..fbda7138e 100644
--- a/actix-http/src/h1/service.rs
+++ b/actix-http/src/h1/service.rs
@@ -15,6 +15,7 @@ use actix_utils::future::ready;
use futures_core::future::LocalBoxFuture;
use tracing::error;
+use super::{codec::Codec, dispatcher::Dispatcher, ExpectHandler, UpgradeHandler};
use crate::{
body::{BoxBody, MessageBody},
config::ServiceConfig,
@@ -23,8 +24,6 @@ use crate::{
ConnectCallback, OnConnectData, Request, Response,
};
-use super::{codec::Codec, dispatcher::Dispatcher, ExpectHandler, UpgradeHandler};
-
/// `ServiceFactory` implementation for HTTP1 transport
pub struct H1Service {
srv: S,
@@ -82,13 +81,8 @@ where
/// Create simple tcp stream service
pub fn tcp(
self,
- ) -> impl ServiceFactory<
- TcpStream,
- Config = (),
- Response = (),
- Error = DispatchError,
- InitError = (),
- > {
+ ) -> impl ServiceFactory
+ {
fn_service(|io: TcpStream| {
let peer_addr = io.peer_addr().ok();
ready(Ok((io, peer_addr)))
@@ -99,8 +93,6 @@ where
#[cfg(feature = "openssl")]
mod openssl {
- use super::*;
-
use actix_tls::accept::{
openssl::{
reexports::{Error as SslError, SslAcceptor},
@@ -109,6 +101,8 @@ mod openssl {
TlsError,
};
+ use super::*;
+
impl H1Service, S, B, X, U>
where
S: ServiceFactory,
diff --git a/actix-http/src/h2/mod.rs b/actix-http/src/h2/mod.rs
index 39198e0fe..e47099cac 100644
--- a/actix-http/src/h2/mod.rs
+++ b/actix-http/src/h2/mod.rs
@@ -23,8 +23,7 @@ use crate::{
mod dispatcher;
mod service;
-pub use self::dispatcher::Dispatcher;
-pub use self::service::H2Service;
+pub use self::{dispatcher::Dispatcher, service::H2Service};
/// HTTP/2 peer stream.
pub struct Payload {
@@ -58,10 +57,7 @@ impl Stream for Payload {
}
}
-pub(crate) fn handshake_with_timeout(
- io: T,
- config: &ServiceConfig,
-) -> HandshakeWithTimeout
+pub(crate) fn handshake_with_timeout(io: T, config: &ServiceConfig) -> HandshakeWithTimeout
where
T: AsyncRead + AsyncWrite + Unpin,
{
diff --git a/actix-http/src/h2/service.rs b/actix-http/src/h2/service.rs
index e526918c7..3f742135a 100644
--- a/actix-http/src/h2/service.rs
+++ b/actix-http/src/h2/service.rs
@@ -16,6 +16,7 @@ use actix_utils::future::ready;
use futures_core::{future::LocalBoxFuture, ready};
use tracing::{error, trace};
+use super::{dispatcher::Dispatcher, handshake_with_timeout, HandshakeWithTimeout};
use crate::{
body::{BoxBody, MessageBody},
config::ServiceConfig,
@@ -24,8 +25,6 @@ use crate::{
ConnectCallback, OnConnectData, Request, Response,
};
-use super::{dispatcher::Dispatcher, handshake_with_timeout, HandshakeWithTimeout};
-
/// `ServiceFactory` implementation for HTTP/2 transport
pub struct H2Service {
srv: S,
diff --git a/actix-http/src/header/map.rs b/actix-http/src/header/map.rs
index d7b4e6dde..e8118be93 100644
--- a/actix-http/src/header/map.rs
+++ b/actix-http/src/header/map.rs
@@ -1120,9 +1120,7 @@ mod tests {
assert!(vals.next().is_none());
}
- fn owned_pair<'a>(
- (name, val): (&'a HeaderName, &'a HeaderValue),
- ) -> (HeaderName, HeaderValue) {
+ fn owned_pair<'a>((name, val): (&'a HeaderName, &'a HeaderValue)) -> (HeaderName, HeaderValue) {
(name.clone(), val.clone())
}
}
diff --git a/actix-http/src/header/mod.rs b/actix-http/src/header/mod.rs
index a63174a92..79f91afef 100644
--- a/actix-http/src/header/mod.rs
+++ b/actix-http/src/header/mod.rs
@@ -3,33 +3,30 @@
// declaring new header consts will yield this error
#![allow(clippy::declare_interior_mutable_const)]
-use percent_encoding::{AsciiSet, CONTROLS};
-
// re-export from http except header map related items
pub use ::http::header::{
HeaderName, HeaderValue, InvalidHeaderName, InvalidHeaderValue, ToStrError,
};
-
// re-export const header names, list is explicit so that any updates to `common` module do not
// conflict with this set
pub use ::http::header::{
ACCEPT, ACCEPT_CHARSET, ACCEPT_ENCODING, ACCEPT_LANGUAGE, ACCEPT_RANGES,
- ACCESS_CONTROL_ALLOW_CREDENTIALS, ACCESS_CONTROL_ALLOW_HEADERS,
- ACCESS_CONTROL_ALLOW_METHODS, ACCESS_CONTROL_ALLOW_ORIGIN, ACCESS_CONTROL_EXPOSE_HEADERS,
- ACCESS_CONTROL_MAX_AGE, ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD, AGE,
- ALLOW, ALT_SVC, AUTHORIZATION, CACHE_CONTROL, CONNECTION, CONTENT_DISPOSITION,
- CONTENT_ENCODING, CONTENT_LANGUAGE, CONTENT_LENGTH, CONTENT_LOCATION, CONTENT_RANGE,
- CONTENT_SECURITY_POLICY, CONTENT_SECURITY_POLICY_REPORT_ONLY, CONTENT_TYPE, COOKIE, DATE,
- DNT, ETAG, EXPECT, EXPIRES, FORWARDED, FROM, HOST, IF_MATCH, IF_MODIFIED_SINCE,
- IF_NONE_MATCH, IF_RANGE, IF_UNMODIFIED_SINCE, LAST_MODIFIED, LINK, LOCATION, MAX_FORWARDS,
- ORIGIN, PRAGMA, PROXY_AUTHENTICATE, PROXY_AUTHORIZATION, PUBLIC_KEY_PINS,
- PUBLIC_KEY_PINS_REPORT_ONLY, RANGE, REFERER, REFERRER_POLICY, REFRESH, RETRY_AFTER,
- SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_EXTENSIONS, SEC_WEBSOCKET_KEY, SEC_WEBSOCKET_PROTOCOL,
- SEC_WEBSOCKET_VERSION, SERVER, SET_COOKIE, STRICT_TRANSPORT_SECURITY, TE, TRAILER,
- TRANSFER_ENCODING, UPGRADE, UPGRADE_INSECURE_REQUESTS, USER_AGENT, VARY, VIA, WARNING,
- WWW_AUTHENTICATE, X_CONTENT_TYPE_OPTIONS, X_DNS_PREFETCH_CONTROL, X_FRAME_OPTIONS,
- X_XSS_PROTECTION,
+ ACCESS_CONTROL_ALLOW_CREDENTIALS, ACCESS_CONTROL_ALLOW_HEADERS, ACCESS_CONTROL_ALLOW_METHODS,
+ ACCESS_CONTROL_ALLOW_ORIGIN, ACCESS_CONTROL_EXPOSE_HEADERS, ACCESS_CONTROL_MAX_AGE,
+ ACCESS_CONTROL_REQUEST_HEADERS, ACCESS_CONTROL_REQUEST_METHOD, AGE, ALLOW, ALT_SVC,
+ AUTHORIZATION, CACHE_CONTROL, CONNECTION, CONTENT_DISPOSITION, CONTENT_ENCODING,
+ CONTENT_LANGUAGE, CONTENT_LENGTH, CONTENT_LOCATION, CONTENT_RANGE, CONTENT_SECURITY_POLICY,
+ CONTENT_SECURITY_POLICY_REPORT_ONLY, CONTENT_TYPE, COOKIE, DATE, DNT, ETAG, EXPECT, EXPIRES,
+ FORWARDED, FROM, HOST, IF_MATCH, IF_MODIFIED_SINCE, IF_NONE_MATCH, IF_RANGE,
+ IF_UNMODIFIED_SINCE, LAST_MODIFIED, LINK, LOCATION, MAX_FORWARDS, ORIGIN, PRAGMA,
+ PROXY_AUTHENTICATE, PROXY_AUTHORIZATION, PUBLIC_KEY_PINS, PUBLIC_KEY_PINS_REPORT_ONLY, RANGE,
+ REFERER, REFERRER_POLICY, REFRESH, RETRY_AFTER, SEC_WEBSOCKET_ACCEPT, SEC_WEBSOCKET_EXTENSIONS,
+ SEC_WEBSOCKET_KEY, SEC_WEBSOCKET_PROTOCOL, SEC_WEBSOCKET_VERSION, SERVER, SET_COOKIE,
+ STRICT_TRANSPORT_SECURITY, TE, TRAILER, TRANSFER_ENCODING, UPGRADE, UPGRADE_INSECURE_REQUESTS,
+ USER_AGENT, VARY, VIA, WARNING, WWW_AUTHENTICATE, X_CONTENT_TYPE_OPTIONS,
+ X_DNS_PREFETCH_CONTROL, X_FRAME_OPTIONS, X_XSS_PROTECTION,
};
+use percent_encoding::{AsciiSet, CONTROLS};
use crate::{error::ParseError, HttpMessage};
@@ -43,23 +40,22 @@ mod utils;
pub use self::{
as_name::AsHeaderName,
+ // re-export list is explicit so that any updates to `http` do not conflict with this set
+ common::{
+ CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
+ CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
+ X_FORWARDED_PROTO,
+ },
into_pair::TryIntoHeaderPair,
into_value::TryIntoHeaderValue,
map::HeaderMap,
shared::{
- parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate,
- LanguageTag, Quality, QualityItem,
+ parse_extended_value, q, Charset, ContentEncoding, ExtendedValue, HttpDate, LanguageTag,
+ Quality, QualityItem,
},
utils::{fmt_comma_delimited, from_comma_delimited, from_one_raw_str, http_percent_encode},
};
-// re-export list is explicit so that any updates to `http` do not conflict with this set
-pub use self::common::{
- CACHE_STATUS, CDN_CACHE_CONTROL, CROSS_ORIGIN_EMBEDDER_POLICY, CROSS_ORIGIN_OPENER_POLICY,
- CROSS_ORIGIN_RESOURCE_POLICY, PERMISSIONS_POLICY, X_FORWARDED_FOR, X_FORWARDED_HOST,
- X_FORWARDED_PROTO,
-};
-
/// An interface for types that already represent a valid header.
pub trait Header: TryIntoHeaderValue {
/// Returns the name of the header field.
diff --git a/actix-http/src/header/shared/mod.rs b/actix-http/src/header/shared/mod.rs
index 257e54d7a..889c73c45 100644
--- a/actix-http/src/header/shared/mod.rs
+++ b/actix-http/src/header/shared/mod.rs
@@ -1,5 +1,7 @@
//! Originally taken from `hyper::header::shared`.
+pub use language_tags::LanguageTag;
+
mod charset;
mod content_encoding;
mod extended;
@@ -7,10 +9,11 @@ mod http_date;
mod quality;
mod quality_item;
-pub use self::charset::Charset;
-pub use self::content_encoding::ContentEncoding;
-pub use self::extended::{parse_extended_value, ExtendedValue};
-pub use self::http_date::HttpDate;
-pub use self::quality::{q, Quality};
-pub use self::quality_item::QualityItem;
-pub use language_tags::LanguageTag;
+pub use self::{
+ charset::Charset,
+ content_encoding::ContentEncoding,
+ extended::{parse_extended_value, ExtendedValue},
+ http_date::HttpDate,
+ quality::{q, Quality},
+ quality_item::QualityItem,
+};
diff --git a/actix-http/src/header/shared/quality_item.rs b/actix-http/src/header/shared/quality_item.rs
index ee1fdb928..a41369c20 100644
--- a/actix-http/src/header/shared/quality_item.rs
+++ b/actix-http/src/header/shared/quality_item.rs
@@ -1,8 +1,7 @@
use std::{cmp, fmt, str};
-use crate::error::ParseError;
-
use super::Quality;
+use crate::error::ParseError;
/// Represents an item with a quality value as defined
/// in [RFC 7231 §5.3.1](https://datatracker.ietf.org/doc/html/rfc7231#section-5.3.1).
diff --git a/actix-http/src/http_message.rs b/actix-http/src/http_message.rs
index 198254e02..3ba9ef752 100644
--- a/actix-http/src/http_message.rs
+++ b/actix-http/src/http_message.rs
@@ -61,9 +61,7 @@ pub trait HttpMessage: Sized {
fn encoding(&self) -> Result<&'static Encoding, ContentTypeError> {
if let Some(mime_type) = self.mime_type()? {
if let Some(charset) = mime_type.get_param("charset") {
- if let Some(enc) =
- Encoding::for_label_no_replacement(charset.as_str().as_bytes())
- {
+ if let Some(enc) = Encoding::for_label_no_replacement(charset.as_str().as_bytes()) {
Ok(enc)
} else {
Err(ContentTypeError::UnknownEncoding)
@@ -146,7 +144,7 @@ mod tests {
.finish();
assert_eq!(req.content_type(), "text/plain");
let req = TestRequest::default()
- .insert_header(("content-type", "application/json; charset=utf=8"))
+ .insert_header(("content-type", "application/json; charset=utf-8"))
.finish();
assert_eq!(req.content_type(), "application/json");
let req = TestRequest::default().finish();
diff --git a/actix-http/src/lib.rs b/actix-http/src/lib.rs
index 8bf834f73..8b755f2f4 100644
--- a/actix-http/src/lib.rs
+++ b/actix-http/src/lib.rs
@@ -28,8 +28,7 @@
#![doc(html_favicon_url = "https://actix.rs/favicon.ico")]
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
-pub use ::http::{uri, uri::Uri};
-pub use ::http::{Method, StatusCode, Version};
+pub use ::http::{uri, uri::Uri, Method, StatusCode, Version};
pub mod body;
mod builder;
@@ -57,22 +56,24 @@ pub mod test;
#[cfg(feature = "ws")]
pub mod ws;
-pub use self::builder::HttpServiceBuilder;
-pub use self::config::ServiceConfig;
-pub use self::error::Error;
-pub use self::extensions::Extensions;
-pub use self::header::ContentEncoding;
-pub use self::http_message::HttpMessage;
-pub use self::keep_alive::KeepAlive;
-pub use self::message::ConnectionType;
-pub use self::message::Message;
#[allow(deprecated)]
-pub use self::payload::{BoxedPayloadStream, Payload, PayloadStream};
-pub use self::requests::{Request, RequestHead, RequestHeadType};
-pub use self::responses::{Response, ResponseBuilder, ResponseHead};
-pub use self::service::HttpService;
+pub use self::payload::PayloadStream;
#[cfg(any(feature = "openssl", feature = "rustls"))]
pub use self::service::TlsAcceptorConfig;
+pub use self::{
+ builder::HttpServiceBuilder,
+ config::ServiceConfig,
+ error::Error,
+ extensions::Extensions,
+ header::ContentEncoding,
+ http_message::HttpMessage,
+ keep_alive::KeepAlive,
+ message::{ConnectionType, Message},
+ payload::{BoxedPayloadStream, Payload},
+ requests::{Request, RequestHead, RequestHeadType},
+ responses::{Response, ResponseBuilder, ResponseHead},
+ service::HttpService,
+};
/// A major HTTP protocol version.
#[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
diff --git a/actix-http/src/requests/mod.rs b/actix-http/src/requests/mod.rs
index fc35da65a..4a27818a5 100644
--- a/actix-http/src/requests/mod.rs
+++ b/actix-http/src/requests/mod.rs
@@ -3,5 +3,7 @@
mod head;
mod request;
-pub use self::head::{RequestHead, RequestHeadType};
-pub use self::request::Request;
+pub use self::{
+ head::{RequestHead, RequestHeadType},
+ request::Request,
+};
diff --git a/actix-http/src/requests/request.rs b/actix-http/src/requests/request.rs
index f4d605b39..1750fb2f7 100644
--- a/actix-http/src/requests/request.rs
+++ b/actix-http/src/requests/request.rs
@@ -10,8 +10,7 @@ use std::{
use http::{header, Method, Uri, Version};
use crate::{
- header::HeaderMap, BoxedPayloadStream, Extensions, HttpMessage, Message, Payload,
- RequestHead,
+ header::HeaderMap, BoxedPayloadStream, Extensions, HttpMessage, Message, Payload, RequestHead,
};
/// An HTTP request.
diff --git a/actix-http/src/responses/mod.rs b/actix-http/src/responses/mod.rs
index 899232b9f..d99628232 100644
--- a/actix-http/src/responses/mod.rs
+++ b/actix-http/src/responses/mod.rs
@@ -5,7 +5,5 @@ mod head;
#[allow(clippy::module_inception)]
mod response;
-pub use self::builder::ResponseBuilder;
pub(crate) use self::head::BoxedResponseHead;
-pub use self::head::ResponseHead;
-pub use self::response::Response;
+pub use self::{builder::ResponseBuilder, head::ResponseHead, response::Response};
diff --git a/actix-http/src/service.rs b/actix-http/src/service.rs
index 108b09c4e..e118d8361 100644
--- a/actix-http/src/service.rs
+++ b/actix-http/src/service.rs
@@ -200,13 +200,8 @@ where
/// The resulting service only supports HTTP/1.x.
pub fn tcp(
self,
- ) -> impl ServiceFactory<
- TcpStream,
- Config = (),
- Response = (),
- Error = DispatchError,
- InitError = (),
- > {
+ ) -> impl ServiceFactory
+ {
fn_service(|io: TcpStream| async {
let peer_addr = io.peer_addr().ok();
Ok((io, Protocol::Http1, peer_addr))
@@ -219,13 +214,8 @@ where
#[cfg(feature = "http2")]
pub fn tcp_auto_h2c(
self,
- ) -> impl ServiceFactory<
- TcpStream,
- Config = (),
- Response = (),
- Error = DispatchError,
- InitError = (),
- > {
+ ) -> impl ServiceFactory
+ {
fn_service(move |io: TcpStream| async move {
// subset of HTTP/2 preface defined by RFC 9113 §3.4
// this subset was chosen to maximize likelihood that peeking only once will allow us to
@@ -563,10 +553,7 @@ where
}
}
- pub(super) fn _poll_ready(
- &self,
- cx: &mut Context<'_>,
- ) -> Poll>> {
+ pub(super) fn _poll_ready(&self, cx: &mut Context<'_>) -> Poll>> {
ready!(self.flow.expect.poll_ready(cx).map_err(Into::into))?;
ready!(self.flow.service.poll_ready(cx).map_err(Into::into))?;
@@ -625,10 +612,7 @@ where
})
}
- fn call(
- &self,
- (io, proto, peer_addr): (T, Protocol, Option),
- ) -> Self::Future {
+ fn call(&self, (io, proto, peer_addr): (T, Protocol, Option)) -> Self::Future {
let conn_data = OnConnectData::from_io(&io, self.on_connect_ext.as_deref());
match proto {
diff --git a/actix-http/src/ws/dispatcher.rs b/actix-http/src/ws/dispatcher.rs
index 396f1e86c..1354d5ae1 100644
--- a/actix-http/src/ws/dispatcher.rs
+++ b/actix-http/src/ws/dispatcher.rs
@@ -70,15 +70,14 @@ mod inner {
task::{Context, Poll},
};
+ use actix_codec::Framed;
use actix_service::{IntoService, Service};
use futures_core::stream::Stream;
use local_channel::mpsc;
use pin_project_lite::pin_project;
- use tracing::debug;
-
- use actix_codec::Framed;
use tokio::io::{AsyncRead, AsyncWrite};
use tokio_util::codec::{Decoder, Encoder};
+ use tracing::debug;
use crate::{body::BoxBody, Response};
@@ -413,9 +412,7 @@ mod inner {
}
State::Error(_) => {
// flush write buffer
- if !this.framed.is_write_buf_empty()
- && this.framed.flush(cx).is_pending()
- {
+ if !this.framed.is_write_buf_empty() && this.framed.flush(cx).is_pending() {
return Poll::Pending;
}
Poll::Ready(Err(this.state.take_error()))
diff --git a/actix-http/src/ws/frame.rs b/actix-http/src/ws/frame.rs
index ce6f1b256..c9fb0cde9 100644
--- a/actix-http/src/ws/frame.rs
+++ b/actix-http/src/ws/frame.rs
@@ -221,9 +221,10 @@ impl Parser {
#[cfg(test)]
mod tests {
- use super::*;
use bytes::Bytes;
+ use super::*;
+
struct F {
finished: bool,
opcode: OpCode,
diff --git a/actix-http/src/ws/mod.rs b/actix-http/src/ws/mod.rs
index 2a0b0a99c..87f9b38f3 100644
--- a/actix-http/src/ws/mod.rs
+++ b/actix-http/src/ws/mod.rs
@@ -8,8 +8,7 @@ use std::io;
use derive_more::{Display, Error, From};
use http::{header, Method, StatusCode};
-use crate::body::BoxBody;
-use crate::{header::HeaderValue, RequestHead, Response, ResponseBuilder};
+use crate::{body::BoxBody, header::HeaderValue, RequestHead, Response, ResponseBuilder};
mod codec;
mod dispatcher;
@@ -17,10 +16,12 @@ mod frame;
mod mask;
mod proto;
-pub use self::codec::{Codec, Frame, Item, Message};
-pub use self::dispatcher::Dispatcher;
-pub use self::frame::Parser;
-pub use self::proto::{hash_key, CloseCode, CloseReason, OpCode};
+pub use self::{
+ codec::{Codec, Frame, Item, Message},
+ dispatcher::Dispatcher,
+ frame::Parser,
+ proto::{hash_key, CloseCode, CloseReason, OpCode},
+};
/// WebSocket protocol errors.
#[derive(Debug, Display, Error, From)]
@@ -219,10 +220,8 @@ pub fn handshake_response(req: &RequestHead) -> ResponseBuilder {
#[cfg(test)]
mod tests {
- use crate::{header, Method};
-
use super::*;
- use crate::test::TestRequest;
+ use crate::{header, test::TestRequest, Method};
#[test]
fn test_handshake() {
diff --git a/actix-http/tests/test_openssl.rs b/actix-http/tests/test_openssl.rs
index 7464bee4e..b4d8ed1a5 100644
--- a/actix-http/tests/test_openssl.rs
+++ b/actix-http/tests/test_openssl.rs
@@ -321,8 +321,7 @@ async fn h2_body_length() {
let mut srv = test_server(move || {
HttpService::build()
.h2(|_| async {
- let body =
- once(async { Ok::<_, Infallible>(Bytes::from_static(STR.as_ref())) });
+ let body = once(async { Ok::<_, Infallible>(Bytes::from_static(STR.as_ref())) });
Ok::<_, Infallible>(
Response::ok().set_body(SizedStream::new(STR.len() as u64, body)),
diff --git a/actix-http/tests/test_rustls.rs b/actix-http/tests/test_rustls.rs
index bf3a9243b..3d9a39cbd 100644
--- a/actix-http/tests/test_rustls.rs
+++ b/actix-http/tests/test_rustls.rs
@@ -90,11 +90,9 @@ pub fn get_negotiated_alpn_protocol(
config.alpn_protocols.push(client_alpn_protocol.to_vec());
- let mut sess = rustls::ClientConnection::new(
- Arc::new(config),
- ServerName::try_from("localhost").unwrap(),
- )
- .unwrap();
+ let mut sess =
+ rustls::ClientConnection::new(Arc::new(config), ServerName::try_from("localhost").unwrap())
+ .unwrap();
let mut sock = StdTcpStream::connect(addr).unwrap();
let mut stream = rustls::Stream::new(&mut sess, &mut sock);
diff --git a/actix-http/tests/test_server.rs b/actix-http/tests/test_server.rs
index 2efb336ae..cfb4d17b8 100644
--- a/actix-http/tests/test_server.rs
+++ b/actix-http/tests/test_server.rs
@@ -166,8 +166,7 @@ async fn chunked_payload() {
for chunk_size in chunk_sizes.iter() {
let mut bytes = Vec::new();
- let random_bytes: Vec =
- (0..*chunk_size).map(|_| rand::random::()).collect();
+ let random_bytes: Vec = (0..*chunk_size).map(|_| rand::random::()).collect();
bytes.extend(format!("{:X}\r\n", chunk_size).as_bytes());
bytes.extend(&random_bytes[..]);
@@ -352,8 +351,7 @@ async fn http10_keepalive() {
.await;
let mut stream = net::TcpStream::connect(srv.addr()).unwrap();
- let _ =
- stream.write_all(b"GET /test/tests/test HTTP/1.0\r\nconnection: keep-alive\r\n\r\n");
+ let _ = stream.write_all(b"GET /test/tests/test HTTP/1.0\r\nconnection: keep-alive\r\n\r\n");
let mut data = vec![0; 1024];
let _ = stream.read(&mut data);
assert_eq!(&data[..17], b"HTTP/1.0 200 OK\r\n");
@@ -795,8 +793,9 @@ async fn not_modified_spec_h1() {
.map_into_boxed_body(),
// with no content-length
- "/body" => Response::with_body(StatusCode::NOT_MODIFIED, "1234")
- .map_into_boxed_body(),
+ "/body" => {
+ Response::with_body(StatusCode::NOT_MODIFIED, "1234").map_into_boxed_body()
+ }
// with manual content-length header and specific None body
"/cl-none" => {
diff --git a/actix-multipart-derive/CHANGES.md b/actix-multipart-derive/CHANGES.md
index caf75aeb3..8a78900ec 100644
--- a/actix-multipart-derive/CHANGES.md
+++ b/actix-multipart-derive/CHANGES.md
@@ -2,6 +2,7 @@
## Unreleased
+- Update `syn` dependency to `2`.
- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
## 0.6.0 - 2023-02-26
diff --git a/actix-multipart-derive/Cargo.toml b/actix-multipart-derive/Cargo.toml
index aca6de84a..41e687e50 100644
--- a/actix-multipart-derive/Cargo.toml
+++ b/actix-multipart-derive/Cargo.toml
@@ -17,11 +17,11 @@ all-features = true
proc-macro = true
[dependencies]
-darling = "0.14"
+darling = "0.20"
parse-size = "1"
proc-macro2 = "1"
quote = "1"
-syn = "1"
+syn = "2"
[dev-dependencies]
actix-multipart = "0.6"
diff --git a/actix-multipart/Cargo.toml b/actix-multipart/Cargo.toml
index 384c0e151..9220e793c 100644
--- a/actix-multipart/Cargo.toml
+++ b/actix-multipart/Cargo.toml
@@ -19,7 +19,7 @@ all-features = true
[features]
default = ["tempfile", "derive"]
derive = ["actix-multipart-derive"]
-tempfile = ["tempfile-dep", "tokio/fs"]
+tempfile = ["dep:tempfile", "tokio/fs"]
[dependencies]
actix-multipart-derive = { version = "=0.6.0", optional = true }
@@ -38,9 +38,8 @@ mime = "0.3"
serde = "1"
serde_json = "1"
serde_plain = "1"
-# TODO(MSRV 1.60): replace with dep: prefix
-tempfile-dep = { package = "tempfile", version = "3.4", optional = true }
-tokio = { version = "1.24.2", features = ["sync"] }
+tempfile = { version = "3.4", optional = true }
+tokio = { version = "1.24.2", features = ["sync", "io-util"] }
[dev-dependencies]
actix-http = "3"
diff --git a/actix-multipart/src/form/bytes.rs b/actix-multipart/src/form/bytes.rs
index 7d64fffce..3c5e2eb10 100644
--- a/actix-multipart/src/form/bytes.rs
+++ b/actix-multipart/src/form/bytes.rs
@@ -27,11 +27,7 @@ pub struct Bytes {
impl<'t> FieldReader<'t> for Bytes {
type Future = LocalBoxFuture<'t, Result>;
- fn read_field(
- _: &'t HttpRequest,
- mut field: Field,
- limits: &'t mut Limits,
- ) -> Self::Future {
+ fn read_field(_: &'t HttpRequest, mut field: Field, limits: &'t mut Limits) -> Self::Future {
Box::pin(async move {
let mut buf = BytesMut::with_capacity(131_072);
diff --git a/actix-multipart/src/form/json.rs b/actix-multipart/src/form/json.rs
index 9951eaaaf..fb90a82b9 100644
--- a/actix-multipart/src/form/json.rs
+++ b/actix-multipart/src/form/json.rs
@@ -7,13 +7,12 @@ use derive_more::{Deref, DerefMut, Display, Error};
use futures_core::future::LocalBoxFuture;
use serde::de::DeserializeOwned;
+use super::FieldErrorHandler;
use crate::{
form::{bytes::Bytes, FieldReader, Limits},
Field, MultipartError,
};
-use super::FieldErrorHandler;
-
/// Deserialize from JSON.
#[derive(Debug, Deref, DerefMut)]
pub struct Json(pub T);
diff --git a/actix-multipart/src/form/mod.rs b/actix-multipart/src/form/mod.rs
index 711d4aeb6..67adfd4b2 100644
--- a/actix-multipart/src/form/mod.rs
+++ b/actix-multipart/src/form/mod.rs
@@ -429,8 +429,7 @@ mod tests {
#[actix_rt::test]
async fn test_options() {
- let srv =
- actix_test::start(|| App::new().route("/", web::post().to(test_options_route)));
+ let srv = actix_test::start(|| App::new().route("/", web::post().to(test_options_route)));
let mut form = multipart::Form::default();
form.add_text("field1", "value");
@@ -481,9 +480,7 @@ mod tests {
field3: Text,
}
- async fn test_field_renaming_route(
- form: MultipartForm,
- ) -> impl Responder {
+ async fn test_field_renaming_route(form: MultipartForm) -> impl Responder {
assert_eq!(&*form.field1, "renamed");
assert_eq!(&*form.field2, "field1");
assert_eq!(&*form.field3, "field3");
@@ -492,9 +489,8 @@ mod tests {
#[actix_rt::test]
async fn test_field_renaming() {
- let srv = actix_test::start(|| {
- App::new().route("/", web::post().to(test_field_renaming_route))
- });
+ let srv =
+ actix_test::start(|| App::new().route("/", web::post().to(test_field_renaming_route)));
let mut form = multipart::Form::default();
form.add_text("renamed", "renamed");
@@ -623,9 +619,7 @@ mod tests {
HttpResponse::Ok().finish()
}
- async fn test_upload_limits_file(
- form: MultipartForm,
- ) -> impl Responder {
+ async fn test_upload_limits_file(form: MultipartForm) -> impl Responder {
assert!(form.field.size > 0);
HttpResponse::Ok().finish()
}
diff --git a/actix-multipart/src/form/tempfile.rs b/actix-multipart/src/form/tempfile.rs
index 3c637e717..9371a026b 100644
--- a/actix-multipart/src/form/tempfile.rs
+++ b/actix-multipart/src/form/tempfile.rs
@@ -11,7 +11,7 @@ use derive_more::{Display, Error};
use futures_core::future::LocalBoxFuture;
use futures_util::TryStreamExt as _;
use mime::Mime;
-use tempfile_dep::NamedTempFile;
+use tempfile::NamedTempFile;
use tokio::io::AsyncWriteExt;
use super::FieldErrorHandler;
@@ -39,23 +39,20 @@ pub struct TempFile {
impl<'t> FieldReader<'t> for TempFile {
type Future = LocalBoxFuture<'t, Result>;
- fn read_field(
- req: &'t HttpRequest,
- mut field: Field,
- limits: &'t mut Limits,
- ) -> Self::Future {
+ fn read_field(req: &'t HttpRequest, mut field: Field, limits: &'t mut Limits) -> Self::Future {
Box::pin(async move {
let config = TempFileConfig::from_req(req);
let field_name = field.name().to_owned();
let mut size = 0;
- let file = config.create_tempfile().map_err(|err| {
- config.map_error(req, &field_name, TempFileError::FileIo(err))
- })?;
+ let file = config
+ .create_tempfile()
+ .map_err(|err| config.map_error(req, &field_name, TempFileError::FileIo(err)))?;
- let mut file_async = tokio::fs::File::from_std(file.reopen().map_err(|err| {
- config.map_error(req, &field_name, TempFileError::FileIo(err))
- })?);
+ let mut file_async =
+ tokio::fs::File::from_std(file.reopen().map_err(|err| {
+ config.map_error(req, &field_name, TempFileError::FileIo(err))
+ })?);
while let Some(chunk) = field.try_next().await? {
limits.try_consume_limits(chunk.len(), false)?;
@@ -65,9 +62,10 @@ impl<'t> FieldReader<'t> for TempFile {
})?;
}
- file_async.flush().await.map_err(|err| {
- config.map_error(req, &field_name, TempFileError::FileIo(err))
- })?;
+ file_async
+ .flush()
+ .await
+ .map_err(|err| config.map_error(req, &field_name, TempFileError::FileIo(err)))?;
Ok(TempFile {
file,
@@ -131,12 +129,7 @@ impl TempFileConfig {
.unwrap_or(&DEFAULT_CONFIG)
}
- fn map_error(
- &self,
- req: &HttpRequest,
- field_name: &str,
- err: TempFileError,
- ) -> MultipartError {
+ fn map_error(&self, req: &HttpRequest, field_name: &str, err: TempFileError) -> MultipartError {
let source = if let Some(ref err_handler) = self.err_handler {
(err_handler)(err, req)
} else {
diff --git a/actix-multipart/src/lib.rs b/actix-multipart/src/lib.rs
index 73e10c913..615a8e6de 100644
--- a/actix-multipart/src/lib.rs
+++ b/actix-multipart/src/lib.rs
@@ -17,5 +17,7 @@ mod server;
pub mod form;
-pub use self::error::MultipartError;
-pub use self::server::{Field, Multipart};
+pub use self::{
+ error::MultipartError,
+ server::{Field, Multipart},
+};
diff --git a/actix-multipart/src/server.rs b/actix-multipart/src/server.rs
index 5dc4d6f69..b20429040 100644
--- a/actix-multipart/src/server.rs
+++ b/actix-multipart/src/server.rs
@@ -161,8 +161,8 @@ impl InnerMultipart {
for h in hdrs {
let name =
HeaderName::try_from(h.name).map_err(|_| ParseError::Header)?;
- let value = HeaderValue::try_from(h.value)
- .map_err(|_| ParseError::Header)?;
+ let value =
+ HeaderValue::try_from(h.value).map_err(|_| ParseError::Header)?;
headers.append(name, value);
}
@@ -222,8 +222,7 @@ impl InnerMultipart {
if chunk.len() < boundary.len() {
continue;
}
- if &chunk[..2] == b"--" && &chunk[2..chunk.len() - 2] == boundary.as_bytes()
- {
+ if &chunk[..2] == b"--" && &chunk[2..chunk.len() - 2] == boundary.as_bytes() {
break;
} else {
if chunk.len() < boundary.len() + 2 {
@@ -268,9 +267,7 @@ impl InnerMultipart {
match field.borrow_mut().poll(safety) {
Poll::Pending => return Poll::Pending,
Poll::Ready(Some(Ok(_))) => continue,
- Poll::Ready(Some(Err(err))) => {
- return Poll::Ready(Some(Err(err)))
- }
+ Poll::Ready(Some(Err(err))) => return Poll::Ready(Some(Err(err))),
Poll::Ready(None) => true,
}
}
@@ -289,8 +286,7 @@ impl InnerMultipart {
match self.state {
// read until first boundary
InnerState::FirstBoundary => {
- match InnerMultipart::skip_until_boundary(&mut payload, &self.boundary)?
- {
+ match InnerMultipart::skip_until_boundary(&mut payload, &self.boundary)? {
Some(eof) => {
if eof {
self.state = InnerState::Eof;
@@ -667,9 +663,7 @@ impl InnerField {
Ok(None) => Poll::Pending,
Ok(Some(line)) => {
if line.as_ref() != b"\r\n" {
- log::warn!(
- "multipart field did not read all the data or it is malformed"
- );
+ log::warn!("multipart field did not read all the data or it is malformed");
}
Poll::Ready(None)
}
diff --git a/actix-router/benches/quoter.rs b/actix-router/benches/quoter.rs
index 9ca06da39..2065fd563 100644
--- a/actix-router/benches/quoter.rs
+++ b/actix-router/benches/quoter.rs
@@ -1,9 +1,9 @@
#![allow(clippy::uninlined_format_args)]
-use criterion::{black_box, criterion_group, criterion_main, Criterion};
-
use std::borrow::Cow;
+use criterion::{black_box, criterion_group, criterion_main, Criterion};
+
fn compare_quoters(c: &mut Criterion) {
let mut group = c.benchmark_group("Compare Quoters");
diff --git a/actix-router/src/de.rs b/actix-router/src/de.rs
index 458e08930..e8c7c658e 100644
--- a/actix-router/src/de.rs
+++ b/actix-router/src/de.rs
@@ -1,10 +1,14 @@
use std::borrow::Cow;
-use serde::de::{self, Deserializer, Error as DeError, Visitor};
-use serde::forward_to_deserialize_any;
+use serde::{
+ de::{self, Deserializer, Error as DeError, Visitor},
+ forward_to_deserialize_any,
+};
-use crate::path::{Path, PathIter};
-use crate::{Quoter, ResourcePath};
+use crate::{
+ path::{Path, PathIter},
+ Quoter, ResourcePath,
+};
thread_local! {
static FULL_QUOTER: Quoter = Quoter::new(b"", b"");
@@ -486,11 +490,7 @@ impl<'de> de::VariantAccess<'de> for UnitVariant {
Err(de::value::Error::custom("not supported"))
}
- fn struct_variant(
- self,
- _: &'static [&'static str],
- _: V,
- ) -> Result
+ fn struct_variant(self, _: &'static [&'static str], _: V) -> Result
where
V: Visitor<'de>,
{
@@ -503,9 +503,7 @@ mod tests {
use serde::{de, Deserialize};
use super::*;
- use crate::path::Path;
- use crate::router::Router;
- use crate::ResourceDef;
+ use crate::{path::Path, router::Router, ResourceDef};
#[derive(Deserialize)]
struct MyStruct {
@@ -572,13 +570,11 @@ mod tests {
assert_eq!(s.key, "name");
assert_eq!(s.value, 32);
- let s: (String, u8) =
- de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap();
+ let s: (String, u8) = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap();
assert_eq!(s.0, "name");
assert_eq!(s.1, 32);
- let res: Vec =
- de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap();
+ let res: Vec = de::Deserialize::deserialize(PathDeserializer::new(&path)).unwrap();
assert_eq!(res[0], "name".to_owned());
assert_eq!(res[1], "32".to_owned());
}
diff --git a/actix-router/src/lib.rs b/actix-router/src/lib.rs
index a02129495..53c0ad82a 100644
--- a/actix-router/src/lib.rs
+++ b/actix-router/src/lib.rs
@@ -18,13 +18,14 @@ mod router;
#[cfg(feature = "http")]
mod url;
-pub use self::de::PathDeserializer;
-pub use self::path::Path;
-pub use self::pattern::{IntoPatterns, Patterns};
-pub use self::quoter::Quoter;
-pub use self::resource::ResourceDef;
-pub use self::resource_path::{Resource, ResourcePath};
-pub use self::router::{ResourceId, Router, RouterBuilder};
-
#[cfg(feature = "http")]
pub use self::url::Url;
+pub use self::{
+ de::PathDeserializer,
+ path::Path,
+ pattern::{IntoPatterns, Patterns},
+ quoter::Quoter,
+ resource::ResourceDef,
+ resource_path::{Resource, ResourcePath},
+ router::{ResourceId, Router, RouterBuilder},
+};
diff --git a/actix-router/src/path.rs b/actix-router/src/path.rs
index 34dabcfbe..dc4150ddc 100644
--- a/actix-router/src/path.rs
+++ b/actix-router/src/path.rs
@@ -1,5 +1,7 @@
-use std::borrow::Cow;
-use std::ops::{DerefMut, Index};
+use std::{
+ borrow::Cow,
+ ops::{DerefMut, Index},
+};
use serde::de;
diff --git a/actix-router/src/resource.rs b/actix-router/src/resource.rs
index c868a3e6f..b8aa6c224 100644
--- a/actix-router/src/resource.rs
+++ b/actix-router/src/resource.rs
@@ -252,7 +252,7 @@ impl ResourceDef {
/// Multi-pattern resources can be constructed by providing a slice (or vec) of patterns.
///
/// # Panics
- /// Panics if path pattern is malformed.
+ /// Panics if any path patterns are malformed.
///
/// # Examples
/// ```
@@ -838,6 +838,7 @@ impl ResourceDef {
fn construct(paths: T, is_prefix: bool) -> Self {
let patterns = paths.patterns();
+
let (pat_type, segments) = match &patterns {
Patterns::Single(pattern) => ResourceDef::parse(pattern, is_prefix, false),
@@ -1741,9 +1742,7 @@ mod tests {
ResourceDef::new("/{a}/{b}/{c}/{d}/{e}/{f}/{g}/{h}/{i}/{j}/{k}/{l}/{m}/{n}/{o}/{p}");
// panics
- ResourceDef::new(
- "/{a}/{b}/{c}/{d}/{e}/{f}/{g}/{h}/{i}/{j}/{k}/{l}/{m}/{n}/{o}/{p}/{q}",
- );
+ ResourceDef::new("/{a}/{b}/{c}/{d}/{e}/{f}/{g}/{h}/{i}/{j}/{k}/{l}/{m}/{n}/{o}/{p}/{q}");
}
#[test]
diff --git a/actix-router/src/router.rs b/actix-router/src/router.rs
index 064c5e904..d31d10ce8 100644
--- a/actix-router/src/router.rs
+++ b/actix-router/src/router.rs
@@ -117,11 +117,7 @@ where
U: Default,
{
/// Registers resource for specified path.
- pub fn path(
- &mut self,
- path: impl IntoPatterns,
- val: T,
- ) -> (&mut ResourceDef, &mut T, &mut U) {
+ pub fn path(&mut self, path: impl IntoPatterns, val: T) -> (&mut ResourceDef, &mut T, &mut U) {
self.push(ResourceDef::new(path), val, U::default())
}
@@ -142,8 +138,10 @@ where
#[cfg(test)]
mod tests {
- use crate::path::Path;
- use crate::router::{ResourceId, Router};
+ use crate::{
+ path::Path,
+ router::{ResourceId, Router},
+ };
#[allow(clippy::cognitive_complexity)]
#[test]
diff --git a/actix-router/src/url.rs b/actix-router/src/url.rs
index 8ae9ea9d8..2920e271d 100644
--- a/actix-router/src/url.rs
+++ b/actix-router/src/url.rs
@@ -1,6 +1,4 @@
-use crate::ResourcePath;
-
-use crate::Quoter;
+use crate::{Quoter, ResourcePath};
thread_local! {
static DEFAULT_QUOTER: Quoter = Quoter::new(b"", b"%/+");
diff --git a/actix-test/CHANGES.md b/actix-test/CHANGES.md
index e3a66c663..aba27dbfc 100644
--- a/actix-test/CHANGES.md
+++ b/actix-test/CHANGES.md
@@ -2,6 +2,7 @@
## Unreleased - 2023-xx-xx
+- Add `TestServerConfig::workers()` setter method.
- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
## 0.1.1 - 2023-02-26
diff --git a/actix-test/src/lib.rs b/actix-test/src/lib.rs
index 2beb64dca..751ab3161 100644
--- a/actix-test/src/lib.rs
+++ b/actix-test/src/lib.rs
@@ -45,8 +45,8 @@ use actix_http::{header::HeaderMap, ws, HttpService, Method, Request, Response};
pub use actix_http_test::unused_addr;
use actix_service::{map_config, IntoServiceFactory, ServiceFactory, ServiceFactoryExt as _};
pub use actix_web::test::{
- call_and_read_body, call_and_read_body_json, call_service, init_service, ok_service,
- read_body, read_body_json, status_service, TestRequest,
+ call_and_read_body, call_and_read_body_json, call_service, init_service, ok_service, read_body,
+ read_body_json, status_service, TestRequest,
};
use actix_web::{
body::MessageBody,
@@ -154,16 +154,16 @@ where
let srv_cfg = cfg.clone();
let timeout = cfg.client_request_timeout;
- let builder = Server::build().workers(1).disable_signals().system_exit();
+ let builder = Server::build()
+ .workers(cfg.workers)
+ .disable_signals()
+ .system_exit();
let srv = match srv_cfg.stream {
StreamType::Tcp => match srv_cfg.tp {
HttpVer::Http1 => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -175,11 +175,8 @@ where
.tcp()
}),
HttpVer::Http2 => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -191,11 +188,8 @@ where
.tcp()
}),
HttpVer::Both => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -210,11 +204,8 @@ where
#[cfg(feature = "openssl")]
StreamType::Openssl(acceptor) => match cfg.tp {
HttpVer::Http1 => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -226,11 +217,8 @@ where
.openssl(acceptor.clone())
}),
HttpVer::Http2 => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -242,11 +230,8 @@ where
.openssl(acceptor.clone())
}),
HttpVer::Both => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -261,11 +246,8 @@ where
#[cfg(feature = "rustls")]
StreamType::Rustls(config) => match cfg.tp {
HttpVer::Http1 => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -277,11 +259,8 @@ where
.rustls(config.clone())
}),
HttpVer::Http2 => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -293,11 +272,8 @@ where
.rustls(config.clone())
}),
HttpVer::Both => builder.listen("test", tcp, move || {
- let app_cfg = AppConfig::__priv_test_new(
- false,
- local_addr.to_string(),
- local_addr,
- );
+ let app_cfg =
+ AppConfig::__priv_test_new(false, local_addr.to_string(), local_addr);
let fac = factory()
.into_factory()
@@ -394,6 +370,7 @@ pub struct TestServerConfig {
stream: StreamType,
client_request_timeout: Duration,
port: u16,
+ workers: usize,
}
impl Default for TestServerConfig {
@@ -410,6 +387,7 @@ impl TestServerConfig {
stream: StreamType::Tcp,
client_request_timeout: Duration::from_secs(5),
port: 0,
+ workers: 1,
}
}
@@ -452,6 +430,14 @@ impl TestServerConfig {
self.port = port;
self
}
+
+ /// Sets number of workers for the test server.
+ ///
+ /// By default, the server uses 1 worker
+ pub fn workers(mut self, workers: usize) -> Self {
+ self.workers = workers;
+ self
+ }
}
/// A basic HTTP server controller that simplifies the process of writing integration tests for
diff --git a/actix-web-actors/src/context.rs b/actix-web-actors/src/context.rs
index f7b11c780..be8fd387c 100644
--- a/actix-web-actors/src/context.rs
+++ b/actix-web-actors/src/context.rs
@@ -1,11 +1,13 @@
-use std::collections::VecDeque;
-use std::future::Future;
-use std::pin::Pin;
-use std::task::{Context, Poll};
+use std::{
+ collections::VecDeque,
+ future::Future,
+ pin::Pin,
+ task::{Context, Poll},
+};
-use actix::dev::{AsyncContextParts, ContextFut, ContextParts, Envelope, Mailbox, ToEnvelope};
-use actix::fut::ActorFuture;
use actix::{
+ dev::{AsyncContextParts, ContextFut, ContextParts, Envelope, Mailbox, ToEnvelope},
+ fut::ActorFuture,
Actor, ActorContext, ActorState, Addr, AsyncContext, Handler, Message, SpawnHandle,
};
use actix_web::error::Error;
@@ -247,9 +249,11 @@ mod tests {
use std::time::Duration;
use actix::Actor;
- use actix_web::http::StatusCode;
- use actix_web::test::{call_service, init_service, read_body, TestRequest};
- use actix_web::{web, App, HttpResponse};
+ use actix_web::{
+ http::StatusCode,
+ test::{call_service, init_service, read_body, TestRequest},
+ web, App, HttpResponse,
+ };
use bytes::Bytes;
use super::*;
diff --git a/actix-web-actors/src/ws.rs b/actix-web-actors/src/ws.rs
index 731f33f86..6ce3e69a1 100644
--- a/actix-web-actors/src/ws.rs
+++ b/actix-web-actors/src/ws.rs
@@ -66,17 +66,14 @@ use std::{
use actix::{
dev::{
- AsyncContextParts, ContextFut, ContextParts, Envelope, Mailbox, StreamHandler,
- ToEnvelope,
+ AsyncContextParts, ContextFut, ContextParts, Envelope, Mailbox, StreamHandler, ToEnvelope,
},
fut::ActorFuture,
Actor, ActorContext, ActorState, Addr, AsyncContext, Handler, Message as ActixMessage,
SpawnHandle,
};
use actix_http::ws::{hash_key, Codec};
-pub use actix_http::ws::{
- CloseCode, CloseReason, Frame, HandshakeError, Message, ProtocolError,
-};
+pub use actix_http::ws::{CloseCode, CloseReason, Frame, HandshakeError, Message, ProtocolError};
use actix_web::{
error::{Error, PayloadError},
http::{
@@ -426,16 +423,16 @@ pub fn handshake_with_protocols(
};
// check requested protocols
- let protocol =
- req.headers()
- .get(&header::SEC_WEBSOCKET_PROTOCOL)
- .and_then(|req_protocols| {
- let req_protocols = req_protocols.to_str().ok()?;
- req_protocols
- .split(',')
- .map(|req_p| req_p.trim())
- .find(|req_p| protocols.iter().any(|p| p == req_p))
- });
+ let protocol = req
+ .headers()
+ .get(&header::SEC_WEBSOCKET_PROTOCOL)
+ .and_then(|req_protocols| {
+ let req_protocols = req_protocols.to_str().ok()?;
+ req_protocols
+ .split(',')
+ .map(|req_p| req_p.trim())
+ .find(|req_p| protocols.iter().any(|p| p == req_p))
+ });
let mut response = HttpResponse::build(StatusCode::SWITCHING_PROTOCOLS)
.upgrade("websocket")
diff --git a/actix-web-codegen/CHANGES.md b/actix-web-codegen/CHANGES.md
index b9e4b0aad..2c5f17226 100644
--- a/actix-web-codegen/CHANGES.md
+++ b/actix-web-codegen/CHANGES.md
@@ -2,6 +2,7 @@
## Unreleased - 2023-xx-xx
+- Update `syn` dependency to `2`.
- Minimum supported Rust version (MSRV) is now 1.65 due to transitive `time` dependency.
## 4.2.0 - 2023-02-26
diff --git a/actix-web-codegen/Cargo.toml b/actix-web-codegen/Cargo.toml
index 4f2fdc566..c202c5d6e 100644
--- a/actix-web-codegen/Cargo.toml
+++ b/actix-web-codegen/Cargo.toml
@@ -18,10 +18,10 @@ proc-macro = true
actix-router = "0.5"
proc-macro2 = "1"
quote = "1"
-syn = { version = "1", features = ["full", "extra-traits"] }
+syn = { version = "2", features = ["full", "extra-traits"] }
[dev-dependencies]
-actix-macros = "0.2.3"
+actix-macros = "0.2.4"
actix-rt = "2.2"
actix-test = "0.1"
actix-utils = "3"
diff --git a/actix-web-codegen/src/lib.rs b/actix-web-codegen/src/lib.rs
index 8b68ea16b..6d6f4f79d 100644
--- a/actix-web-codegen/src/lib.rs
+++ b/actix-web-codegen/src/lib.rs
@@ -153,37 +153,37 @@ pub fn routes(_: TokenStream, input: TokenStream) -> TokenStream {
macro_rules! method_macro {
($variant:ident, $method:ident) => {
-#[doc = concat!("Creates route handler with `actix_web::guard::", stringify!($variant), "`.")]
-///
-/// # Syntax
-/// ```plain
-#[doc = concat!("#[", stringify!($method), r#"("path"[, attributes])]"#)]
-/// ```
-///
-/// # Attributes
-/// - `"path"`: Raw literal string with path for which to register handler.
-/// - `name = "resource_name"`: Specifies resource name for the handler. If not set, the function
-/// name of handler is used.
-/// - `guard = "function_name"`: Registers function as guard using `actix_web::guard::fn_guard`.
-/// - `wrap = "Middleware"`: Registers a resource middleware.
-///
-/// # Notes
-/// Function name can be specified as any expression that is going to be accessible to the
-/// generate code, e.g `my_guard` or `my_module::my_guard`.
-///
-/// # Examples
-/// ```
-/// # use actix_web::HttpResponse;
-#[doc = concat!("# use actix_web_codegen::", stringify!($method), ";")]
-#[doc = concat!("#[", stringify!($method), r#"("/")]"#)]
-/// async fn example() -> HttpResponse {
-/// HttpResponse::Ok().finish()
-/// }
-/// ```
-#[proc_macro_attribute]
-pub fn $method(args: TokenStream, input: TokenStream) -> TokenStream {
- route::with_method(Some(route::MethodType::$variant), args, input)
-}
+ #[doc = concat!("Creates route handler with `actix_web::guard::", stringify!($variant), "`.")]
+ ///
+ /// # Syntax
+ /// ```plain
+ #[doc = concat!("#[", stringify!($method), r#"("path"[, attributes])]"#)]
+ /// ```
+ ///
+ /// # Attributes
+ /// - `"path"`: Raw literal string with path for which to register handler.
+ /// - `name = "resource_name"`: Specifies resource name for the handler. If not set, the
+ /// function name of handler is used.
+ /// - `guard = "function_name"`: Registers function as guard using `actix_web::guard::fn_guard`.
+ /// - `wrap = "Middleware"`: Registers a resource middleware.
+ ///
+ /// # Notes
+ /// Function name can be specified as any expression that is going to be accessible to the
+ /// generate code, e.g `my_guard` or `my_module::my_guard`.
+ ///
+ /// # Examples
+ /// ```
+ /// # use actix_web::HttpResponse;
+ #[doc = concat!("# use actix_web_codegen::", stringify!($method), ";")]
+ #[doc = concat!("#[", stringify!($method), r#"("/")]"#)]
+ /// async fn example() -> HttpResponse {
+ /// HttpResponse::Ok().finish()
+ /// }
+ /// ```
+ #[proc_macro_attribute]
+ pub fn $method(args: TokenStream, input: TokenStream) -> TokenStream {
+ route::with_method(Some(route::MethodType::$variant), args, input)
+ }
};
}
diff --git a/actix-web-codegen/src/route.rs b/actix-web-codegen/src/route.rs
index 0b8bb0f38..525a1c8ba 100644
--- a/actix-web-codegen/src/route.rs
+++ b/actix-web-codegen/src/route.rs
@@ -4,7 +4,54 @@ use actix_router::ResourceDef;
use proc_macro::TokenStream;
use proc_macro2::{Span, TokenStream as TokenStream2};
use quote::{quote, ToTokens, TokenStreamExt};
-use syn::{parse_macro_input, AttributeArgs, Ident, LitStr, Meta, NestedMeta, Path};
+use syn::{punctuated::Punctuated, Ident, LitStr, Path, Token};
+
+#[derive(Debug)]
+pub struct RouteArgs {
+ path: syn::LitStr,
+ options: Punctuated,
+}
+
+impl syn::parse::Parse for RouteArgs {
+ fn parse(input: syn::parse::ParseStream<'_>) -> syn::Result {
+ // path to match: "/foo"
+ let path = input.parse::().map_err(|mut err| {
+ err.combine(syn::Error::new(
+ err.span(),
+ r#"invalid service definition, expected #[("")]"#,
+ ));
+
+ err
+ })?;
+
+ // verify that path pattern is valid
+ let _ = ResourceDef::new(path.value());
+
+ // if there's no comma, assume that no options are provided
+ if !input.peek(Token![,]) {
+ return Ok(Self {
+ path,
+ options: Punctuated::new(),
+ });
+ }
+
+ // advance past comma separator
+ input.parse::()?;
+
+ // if next char is a literal, assume that it is a string and show multi-path error
+ if input.cursor().literal().is_some() {
+ return Err(syn::Error::new(
+ Span::call_site(),
+ r#"Multiple paths specified! There should be only one."#,
+ ));
+ }
+
+ // zero or more options: name = "foo"
+ let options = input.parse_terminated(syn::MetaNameValue::parse, Token![,])?;
+
+ Ok(Self { path, options })
+ }
+}
macro_rules! standard_method_type {
(
@@ -182,111 +229,90 @@ struct Args {
}
impl Args {
- fn new(args: AttributeArgs, method: Option) -> syn::Result {
- let mut path = None;
+ fn new(args: RouteArgs, method: Option) -> syn::Result {
let mut resource_name = None;
let mut guards = Vec::new();
let mut wrappers = Vec::new();
let mut methods = HashSet::new();
- if args.is_empty() {
- return Err(syn::Error::new(
- Span::call_site(),
- format!(
- r#"invalid service definition, expected #[{}("")]"#,
- method
- .map_or("route", |it| it.as_str())
- .to_ascii_lowercase()
- ),
- ));
- }
-
let is_route_macro = method.is_none();
if let Some(method) = method {
methods.insert(MethodTypeExt::Standard(method));
}
- for arg in args {
- match arg {
- NestedMeta::Lit(syn::Lit::Str(lit)) => match path {
- None => {
- let _ = ResourceDef::new(lit.value());
- path = Some(lit);
- }
- _ => {
- return Err(syn::Error::new_spanned(
- lit,
- "Multiple paths specified! Should be only one!",
- ));
- }
- },
-
- NestedMeta::Meta(syn::Meta::NameValue(nv)) => {
- if nv.path.is_ident("name") {
- if let syn::Lit::Str(lit) = nv.lit {
- resource_name = Some(lit);
- } else {
- return Err(syn::Error::new_spanned(
- nv.lit,
- "Attribute name expects literal string!",
- ));
- }
- } else if nv.path.is_ident("guard") {
- if let syn::Lit::Str(lit) = nv.lit {
- guards.push(lit.parse::()?);
- } else {
- return Err(syn::Error::new_spanned(
- nv.lit,
- "Attribute guard expects literal string!",
- ));
- }
- } else if nv.path.is_ident("wrap") {
- if let syn::Lit::Str(lit) = nv.lit {
- wrappers.push(lit.parse()?);
- } else {
- return Err(syn::Error::new_spanned(
- nv.lit,
- "Attribute wrap expects type",
- ));
- }
- } else if nv.path.is_ident("method") {
- if !is_route_macro {
- return Err(syn::Error::new_spanned(
+ for nv in args.options {
+ if nv.path.is_ident("name") {
+ if let syn::Expr::Lit(syn::ExprLit {
+ lit: syn::Lit::Str(lit),
+ ..
+ }) = nv.value
+ {
+ resource_name = Some(lit);
+ } else {
+ return Err(syn::Error::new_spanned(
+ nv.value,
+ "Attribute name expects literal string!",
+ ));
+ }
+ } else if nv.path.is_ident("guard") {
+ if let syn::Expr::Lit(syn::ExprLit {
+ lit: syn::Lit::Str(lit),
+ ..
+ }) = nv.value
+ {
+ guards.push(lit.parse::()?);
+ } else {
+ return Err(syn::Error::new_spanned(
+ nv.value,
+ "Attribute guard expects literal string!",
+ ));
+ }
+ } else if nv.path.is_ident("wrap") {
+ if let syn::Expr::Lit(syn::ExprLit {
+ lit: syn::Lit::Str(lit),
+ ..
+ }) = nv.value
+ {
+ wrappers.push(lit.parse()?);
+ } else {
+ return Err(syn::Error::new_spanned(
+ nv.value,
+ "Attribute wrap expects type",
+ ));
+ }
+ } else if nv.path.is_ident("method") {
+ if !is_route_macro {
+ return Err(syn::Error::new_spanned(
&nv,
"HTTP method forbidden here. To handle multiple methods, use `route` instead",
));
- } else if let syn::Lit::Str(ref lit) = nv.lit {
- if !methods.insert(MethodTypeExt::try_from(lit)?) {
- return Err(syn::Error::new_spanned(
- &nv.lit,
- format!(
- "HTTP method defined more than once: `{}`",
- lit.value()
- ),
- ));
- }
- } else {
- return Err(syn::Error::new_spanned(
- nv.lit,
- "Attribute method expects literal string!",
- ));
- }
- } else {
+ } else if let syn::Expr::Lit(syn::ExprLit {
+ lit: syn::Lit::Str(lit),
+ ..
+ }) = nv.value.clone()
+ {
+ if !methods.insert(MethodTypeExt::try_from(&lit)?) {
return Err(syn::Error::new_spanned(
- nv.path,
- "Unknown attribute key is specified. Allowed: guard, method and wrap",
+ nv.value,
+ format!("HTTP method defined more than once: `{}`", lit.value()),
));
}
+ } else {
+ return Err(syn::Error::new_spanned(
+ nv.value,
+ "Attribute method expects literal string!",
+ ));
}
-
- arg => {
- return Err(syn::Error::new_spanned(arg, "Unknown attribute."));
- }
+ } else {
+ return Err(syn::Error::new_spanned(
+ nv.path,
+ "Unknown attribute key is specified. Allowed: guard, method and wrap",
+ ));
}
}
Ok(Args {
- path: path.unwrap(),
+ path: args.path,
resource_name,
guards,
wrappers,
@@ -312,11 +338,7 @@ pub struct Route {
}
impl Route {
- pub fn new(
- args: AttributeArgs,
- ast: syn::ItemFn,
- method: Option,
- ) -> syn::Result {
+ pub fn new(args: RouteArgs, ast: syn::ItemFn, method: Option) -> syn::Result {
let name = ast.sig.ident.clone();
// Try and pull out the doc comments so that we can reapply them to the generated struct.
@@ -324,7 +346,7 @@ impl Route {
let doc_attributes = ast
.attrs
.iter()
- .filter(|attr| attr.path.is_ident("doc"))
+ .filter(|attr| attr.path().is_ident("doc"))
.cloned()
.collect();
@@ -360,7 +382,7 @@ impl Route {
let doc_attributes = ast
.attrs
.iter()
- .filter(|attr| attr.path.is_ident("doc"))
+ .filter(|attr| attr.path().is_ident("doc"))
.cloned()
.collect();
@@ -455,7 +477,11 @@ pub(crate) fn with_method(
args: TokenStream,
input: TokenStream,
) -> TokenStream {
- let args = parse_macro_input!(args as syn::AttributeArgs);
+ let args = match syn::parse(args) {
+ Ok(args) => args,
+ // on parse error, make IDEs happy; see fn docs
+ Err(err) => return input_and_compile_error(input, err),
+ };
let ast = match syn::parse::(input.clone()) {
Ok(ast) => ast,
@@ -480,7 +506,7 @@ pub(crate) fn with_methods(input: TokenStream) -> TokenStream {
let (methods, others) = ast
.attrs
.into_iter()
- .map(|attr| match MethodType::from_path(&attr.path) {
+ .map(|attr| match MethodType::from_path(attr.path()) {
Ok(method) => Ok((method, attr)),
Err(_) => Err(attr),
})
@@ -488,31 +514,27 @@ pub(crate) fn with_methods(input: TokenStream) -> TokenStream {
ast.attrs = others.into_iter().map(Result::unwrap_err).collect();
- let methods =
- match methods
- .into_iter()
- .map(Result::unwrap)
- .map(|(method, attr)| {
- attr.parse_meta().and_then(|args| {
- if let Meta::List(args) = args {
- Args::new(args.nested.into_iter().collect(), Some(method))
- } else {
- Err(syn::Error::new_spanned(attr, "Invalid input for macro"))
- }
- })
- })
- .collect::, _>>()
- {
- Ok(methods) if methods.is_empty() => return input_and_compile_error(
+ let methods = match methods
+ .into_iter()
+ .map(Result::unwrap)
+ .map(|(method, attr)| {
+ attr.parse_args()
+ .and_then(|args| Args::new(args, Some(method)))
+ })
+ .collect::, _>>()
+ {
+ Ok(methods) if methods.is_empty() => {
+ return input_and_compile_error(
input,
syn::Error::new(
Span::call_site(),
"The #[routes] macro requires at least one `#[(..)]` attribute.",
),
- ),
- Ok(methods) => methods,
- Err(err) => return input_and_compile_error(input, err),
- };
+ )
+ }
+ Ok(methods) => methods,
+ Err(err) => return input_and_compile_error(input, err),
+ };
match Route::multiple(methods, ast) {
Ok(route) => route.into_token_stream().into(),
diff --git a/actix-web-codegen/tests/trybuild/routes-missing-args-fail.stderr b/actix-web-codegen/tests/trybuild/routes-missing-args-fail.stderr
index e845241a4..2e84c296a 100644
--- a/actix-web-codegen/tests/trybuild/routes-missing-args-fail.stderr
+++ b/actix-web-codegen/tests/trybuild/routes-missing-args-fail.stderr
@@ -1,4 +1,4 @@
-error: invalid service definition, expected #[get("")]
+error: unexpected end of input, expected string literal
--> tests/trybuild/routes-missing-args-fail.rs:4:1
|
4 | #[get]
@@ -6,11 +6,19 @@ error: invalid service definition, expected #[get("")]
|
= note: this error originates in the attribute macro `get` (in Nightly builds, run with -Z macro-backtrace for more info)
-error: Invalid input for macro
+error: invalid service definition, expected #[("")]
--> tests/trybuild/routes-missing-args-fail.rs:4:1
|
4 | #[get]
| ^^^^^^
+ |
+ = note: this error originates in the attribute macro `get` (in Nightly builds, run with -Z macro-backtrace for more info)
+
+error: expected attribute arguments in parentheses: #[get(...)]
+ --> tests/trybuild/routes-missing-args-fail.rs:4:3
+ |
+4 | #[get]
+ | ^^^
error[E0277]: the trait bound `fn() -> impl std::future::Future