From 8fd1772d5e84c3481b004982b8b4e4ad9aec30f2 Mon Sep 17 00:00:00 2001 From: Luca Palmieri Date: Tue, 29 Mar 2022 11:46:13 +0100 Subject: [PATCH] Consistent import formatting (#237) --- .github/PULL_REQUEST_TEMPLATE.md | 2 +- .github/workflows/lint.yml | 2 +- actix-cors/src/error.rs | 1 - actix-cors/tests/tests.rs | 3 +-- actix-identity/src/cookie.rs | 5 ++--- actix-protobuf/src/lib.rs | 3 ++- actix-redis/src/lib.rs | 3 +-- actix-session/src/storage/mod.rs | 2 -- actix-session/tests/opaque_errors.rs | 5 +++-- actix-web-httpauth/examples/middleware-closure.rs | 1 - actix-web-httpauth/examples/middleware.rs | 1 - actix-web-httpauth/src/extractors/errors.rs | 3 ++- actix-web-httpauth/src/middleware.rs | 7 ++++--- rustfmt.toml | 1 + 14 files changed, 18 insertions(+), 21 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 36f7bc558..1c3875860 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -14,7 +14,7 @@ INSERT_PR_TYPE - [ ] Tests for the changes have been added / updated. - [ ] Documentation comments have been added / updated. - [ ] A changelog entry has been made for the appropriate packages. -- [ ] Format code with the latest stable rustfmt. +- [ ] Format code with the nightly rustfmt (`cargo +nightly fmt`). ## Overview diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index e966fa4ab..01e051ca1 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -13,7 +13,7 @@ jobs: - name: Install Rust uses: actions-rs/toolchain@v1 with: - toolchain: stable + toolchain: nightly components: rustfmt - name: Check with rustfmt uses: actions-rs/cargo@v1 diff --git a/actix-cors/src/error.rs b/actix-cors/src/error.rs index 9f4130f9e..687ab0804 100644 --- a/actix-cors/src/error.rs +++ b/actix-cors/src/error.rs @@ -1,5 +1,4 @@ use actix_web::{http::StatusCode, HttpResponse, ResponseError}; - use derive_more::{Display, Error}; /// Errors that can occur when processing CORS guarded requests. diff --git a/actix-cors/tests/tests.rs b/actix-cors/tests/tests.rs index 9165e82e1..7b6075c14 100644 --- a/actix-cors/tests/tests.rs +++ b/actix-cors/tests/tests.rs @@ -1,3 +1,4 @@ +use actix_cors::Cors; use actix_utils::future::ok; use actix_web::dev::fn_service; use actix_web::{ @@ -11,8 +12,6 @@ use actix_web::{ }; use regex::bytes::Regex; -use actix_cors::Cors; - fn val_as_str(val: &HeaderValue) -> &str { val.to_str().unwrap() } diff --git a/actix-identity/src/cookie.rs b/actix-identity/src/cookie.rs index e2653e9c6..0e9733688 100644 --- a/actix-identity/src/cookie.rs +++ b/actix-identity/src/cookie.rs @@ -1,9 +1,6 @@ use std::{rc::Rc, time::SystemTime}; use actix_utils::future::{ready, Ready}; -use serde::{Deserialize, Serialize}; -use time::Duration; - use actix_web::{ cookie::{Cookie, CookieJar, Key, SameSite}, dev::{ServiceRequest, ServiceResponse}, @@ -11,6 +8,8 @@ use actix_web::{ http::header::{self, HeaderValue}, HttpMessage, }; +use serde::{Deserialize, Serialize}; +use time::Duration; use crate::IdentityPolicy; diff --git a/actix-protobuf/src/lib.rs b/actix-protobuf/src/lib.rs index 1908bc30f..21cd058e3 100644 --- a/actix-protobuf/src/lib.rs +++ b/actix-protobuf/src/lib.rs @@ -268,10 +268,11 @@ impl ProtoBufResponseBuilder for HttpResponseBuilder { #[cfg(test)] mod tests { - use super::*; use actix_web::http::header; use actix_web::test::TestRequest; + use super::*; + impl PartialEq for ProtoBufPayloadError { fn eq(&self, other: &ProtoBufPayloadError) -> bool { match *self { diff --git a/actix-redis/src/lib.rs b/actix-redis/src/lib.rs index 94e350c23..26a94a72f 100644 --- a/actix-redis/src/lib.rs +++ b/actix-redis/src/lib.rs @@ -4,9 +4,8 @@ #![warn(future_incompatible)] mod redis; -pub use redis::{Command, RedisActor}; - use derive_more::{Display, Error, From}; +pub use redis::{Command, RedisActor}; /// General purpose `actix-redis` error. #[derive(Debug, Display, Error, From)] diff --git a/actix-session/src/storage/mod.rs b/actix-session/src/storage/mod.rs index d8c47a5e8..1a74a8c6f 100644 --- a/actix-session/src/storage/mod.rs +++ b/actix-session/src/storage/mod.rs @@ -20,9 +20,7 @@ mod utils; #[cfg(feature = "cookie-session")] pub use cookie::CookieSessionStore; - #[cfg(feature = "redis-actor-session")] pub use redis_actor::{RedisActorSessionStore, RedisActorSessionStoreBuilder}; - #[cfg(feature = "redis-rs-session")] pub use redis_rs::{RedisSessionStore, RedisSessionStoreBuilder}; diff --git a/actix-session/tests/opaque_errors.rs b/actix-session/tests/opaque_errors.rs index cb8e9164c..90e0f5c95 100644 --- a/actix-session/tests/opaque_errors.rs +++ b/actix-session/tests/opaque_errors.rs @@ -1,3 +1,6 @@ +use std::collections::HashMap; +use std::convert::TryInto; + use actix_session::storage::{LoadError, SaveError, SessionKey, SessionStore, UpdateError}; use actix_session::{Session, SessionMiddleware}; use actix_web::body::MessageBody; @@ -8,8 +11,6 @@ use actix_web::{ test, web, App, Responder, }; use anyhow::Error; -use std::collections::HashMap; -use std::convert::TryInto; #[actix_web::test] async fn errors_are_opaque() { diff --git a/actix-web-httpauth/examples/middleware-closure.rs b/actix-web-httpauth/examples/middleware-closure.rs index 0935dc605..ac0ef9fcb 100644 --- a/actix-web-httpauth/examples/middleware-closure.rs +++ b/actix-web-httpauth/examples/middleware-closure.rs @@ -1,5 +1,4 @@ use actix_web::{middleware, web, App, HttpServer}; - use actix_web_httpauth::middleware::HttpAuthentication; #[actix_web::main] diff --git a/actix-web-httpauth/examples/middleware.rs b/actix-web-httpauth/examples/middleware.rs index 7accb2bb7..4df4c0341 100644 --- a/actix-web-httpauth/examples/middleware.rs +++ b/actix-web-httpauth/examples/middleware.rs @@ -1,6 +1,5 @@ use actix_web::dev::ServiceRequest; use actix_web::{middleware, web, App, Error, HttpServer}; - use actix_web_httpauth::extractors::basic::BasicAuth; use actix_web_httpauth::middleware::HttpAuthentication; diff --git a/actix-web-httpauth/src/extractors/errors.rs b/actix-web-httpauth/src/extractors/errors.rs index 872e14897..7aab734a1 100644 --- a/actix-web-httpauth/src/extractors/errors.rs +++ b/actix-web-httpauth/src/extractors/errors.rs @@ -65,9 +65,10 @@ impl ResponseError for AuthenticationError { #[cfg(test)] mod tests { + use actix_web::Error; + use super::*; use crate::headers::www_authenticate::basic::Basic; - use actix_web::Error; #[test] fn test_status_code_is_preserved_across_error_conversions() { diff --git a/actix-web-httpauth/src/middleware.rs b/actix-web-httpauth/src/middleware.rs index f3a91c527..16b0004f4 100644 --- a/actix-web-httpauth/src/middleware.rs +++ b/actix-web-httpauth/src/middleware.rs @@ -239,15 +239,16 @@ where #[cfg(test)] mod tests { - use super::*; - use crate::extractors::basic::BasicAuth; - use crate::extractors::bearer::BearerAuth; use actix_service::{into_service, Service}; use actix_web::error::ErrorForbidden; use actix_web::http::StatusCode; use actix_web::test::TestRequest; use actix_web::{error, web, App, HttpResponse}; + use super::*; + use crate::extractors::basic::BasicAuth; + use crate::extractors::bearer::BearerAuth; + /// This is a test for https://github.com/actix/actix-extras/issues/10 #[actix_web::test] async fn test_middleware_panic() { diff --git a/rustfmt.toml b/rustfmt.toml index 44148a2d3..38b9e24df 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -1 +1,2 @@ reorder_imports = true +group_imports = "StdExternalCrate"