Update rustfmt.toml to current

dacut · dacut · commit 754515d40537 · 2024-07-10T17:40:42.000-07:00
diff --git a/.rustfmt.toml b/.rustfmt.toml
diff --git a/base-library/src/aws4.rs b/base-library/src/aws4.rs
@@ -1,21 +1,25 @@
-use chrono::{Date, DateTime, Duration, NaiveDate, NaiveDateTime, NaiveTime, Utc};
-use http::{
-    header::{HeaderMap, HeaderName, HeaderValue},
-    uri::{PathAndQuery, Uri},
+use {
+    chrono::{Date, DateTime, Duration, NaiveDate, NaiveDateTime, NaiveTime, Utc},
+    http::{
+        header::{HeaderMap, HeaderName, HeaderValue},
+        uri::{PathAndQuery, Uri},
+    },
+    log::debug,
+    scratchstack_aws_principal::PrincipalActor,
+    std::{
+        env,
+        fs::File,
+        io::{BufRead, BufReader, Read},
+        path::PathBuf,
+        str::from_utf8,
+    },
+    tower::Service,
 };
-use log::debug;
-use scratchstack_aws_principal::PrincipalActor;
-use std::{
-    env,
-    fs::File,
-    io::{BufRead, BufReader, Read},
-    path::PathBuf,
-    str::from_utf8,
-};
-use tower::Service;
 
-use crate::{get_signing_key_fn, sigv4_verify_at, Request, SignatureError, SigningKey, SigningKeyKind};
-use test_env_log;
+use {
+    crate::{get_signing_key_fn, sigv4_verify_at, Request, SignatureError, SigningKey, SigningKeyKind},
+    test_env_log,
+};
 
 const TEST_REGION: &str = "us-east-1";
 const TEST_SERVICE: &str = "service";
@@ -406,8 +410,8 @@ fn parse_file(f: File, filename: &PathBuf) -> Request {
 
     Request {
         request_method: method.to_string(),
-        uri: uri,
-        headers: headers,
+        uri,
+        headers,
         body: Some(body),
     }
 }
diff --git a/base-library/src/chronoutil.rs b/base-library/src/chronoutil.rs
@@ -1,10 +1,14 @@
 use std::{error::Error, str::FromStr};
 
-use chrono::format::{ParseError, ParseResult};
-use chrono::offset::{FixedOffset, TimeZone};
-use chrono::{DateTime, Utc};
-use lazy_static::lazy_static;
-use regex::Regex;
+use {
+    chrono::{
+        format::{ParseError, ParseResult},
+        offset::{FixedOffset, TimeZone},
+        DateTime, Utc,
+    },
+    lazy_static::lazy_static,
+    regex::Regex,
+};
 
 lazy_static! {
     /// ISO 8601 timestamp format
diff --git a/base-library/src/signature.rs b/base-library/src/signature.rs
@@ -19,21 +19,22 @@ use std::{
     task::{Context, Poll},
 };
 
-use chrono::{Date, DateTime, Duration, Utc};
-use http::{
-    header::{HeaderMap, HeaderValue},
-    request::Parts,
-    Uri,
+use {
+    chrono::{Date, DateTime, Duration, Utc},
+    http::{
+        header::{HeaderMap, HeaderValue},
+        request::Parts,
+        Uri,
+    },
+    lazy_static::lazy_static,
+    log::trace,
+    regex::Regex,
+    ring::digest::{digest, SHA256},
+    scratchstack_aws_principal::PrincipalActor,
+    tower::{BoxError, Service},
 };
-use lazy_static::lazy_static;
-use log::trace;
-use regex::Regex;
-use ring::digest::{digest, SHA256};
-use scratchstack_aws_principal::PrincipalActor;
-use tower::{BoxError, Service};
-
-use crate::chronoutil::parse_date_str;
-use crate::hmac::hmac_sha256;
+
+use crate::{chronoutil::parse_date_str, hmac::hmac_sha256};
 
 /// Content-Type string for HTML forms
 const APPLICATION_X_WWW_FORM_URLENCODED: &str = "application/x-www-form-urlencoded";
diff --git a/base-library/src/unittest.rs b/base-library/src/unittest.rs
@@ -1,18 +1,22 @@
-use super::signature::{
-    canonicalize_uri_path, normalize_query_parameters, normalize_uri_path_component, sigv4_verify, Request,
-    SignatureError, SigningKey, SigningKeyKind,
+use {
+    super::signature::{
+        canonicalize_uri_path, normalize_query_parameters, normalize_uri_path_component, sigv4_verify, Request,
+        SignatureError, SigningKey, SigningKeyKind,
+    },
+    std::fmt::Write,
 };
-use std::fmt::Write;
 
-use super::chronoutil::ParseISO8601;
-use chrono::{Date, DateTime, Datelike, NaiveDate, Timelike, Utc};
-use http::{
-    header::{HeaderMap, HeaderValue},
-    uri::{PathAndQuery, Uri},
+use {
+    super::chronoutil::ParseISO8601,
+    chrono::{Date, DateTime, Datelike, NaiveDate, Timelike, Utc},
+    http::{
+        header::{HeaderMap, HeaderValue},
+        uri::{PathAndQuery, Uri},
+    },
+    scratchstack_aws_principal::PrincipalActor,
+    test_log::{self, test},
+    tokio,
 };
-use scratchstack_aws_principal::PrincipalActor;
-use test_log::{self, test};
-use tokio;
 
 const TEST_REGION: &str = "us-east-1";
 const TEST_SERVICE: &str = "service";
@@ -191,8 +195,8 @@ fn duplicate_headers() {
     let uri = Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap();
     let request = Request {
         request_method: "GET".to_string(),
-        uri: uri,
-        headers: headers,
+        uri,
+        headers,
         body: None,
     };
 
@@ -244,8 +248,8 @@ async fn run_auth_test_get_err(auth_str: &str) -> SignatureError {
     let uri = Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap();
     let request = Request {
         request_method: "GET".to_string(),
-        uri: uri,
-        headers: headers,
+        uri,
+        headers,
         body: None,
     };
 
@@ -379,8 +383,8 @@ async fn test_multiple_algorithms() {
     let uri = Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap();
     let request = Request {
         request_method: "GET".to_string(),
-        uri: uri,
-        headers: headers,
+        uri,
+        headers,
         body: None,
     };
 
@@ -401,7 +405,7 @@ async fn duplicate_query_parameter() {
             .path_and_query(PathAndQuery::from_static("/?X-Amz-Signature=1234&X-Amz-Signature=1234"))
             .build()
             .unwrap(),
-        headers: headers,
+        headers,
         body: None,
     };
 
@@ -418,7 +422,7 @@ fn missing_header() {
     let request = Request {
         request_method: "GET".to_string(),
         uri: Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap(),
-        headers: headers,
+        headers,
         body: None,
     };
 
@@ -435,7 +439,7 @@ fn missing_date() {
     let request = Request {
         request_method: "GET".to_string(),
         uri: Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap(),
-        headers: headers,
+        headers,
         body: None,
     };
 
@@ -453,7 +457,7 @@ fn invalid_date() {
     let request = Request {
         request_method: "GET".to_string(),
         uri: Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap(),
-        headers: headers,
+        headers,
         body: None,
     };
 
@@ -466,7 +470,7 @@ fn invalid_date() {
     let request = Request {
         request_method: "GET".to_string(),
         uri: Uri::builder().path_and_query(PathAndQuery::from_static("/")).build().unwrap(),
-        headers: headers,
+        headers,
         body: None,
     };
 
@@ -476,7 +480,7 @@ fn invalid_date() {
     let request = Request {
         request_method: "GET".to_string(),
         uri: Uri::builder().path_and_query(PathAndQuery::from_static("/?X-Amz-Date=zzzz")).build().unwrap(),
-        headers: headers,
+        headers,
         body: None,
     };
 
diff --git a/hyper-integration/src/lib.rs b/hyper-integration/src/lib.rs
@@ -3,35 +3,36 @@ pub use crate::service::AwsSigV4VerifierService;
 
 #[cfg(test)]
 mod tests {
-    use crate::AwsSigV4VerifierService;
-    use chrono::{Date, Utc};
-    use futures::stream::StreamExt;
-    use http::StatusCode;
-    use hyper::{
-        client::{connect::dns::GaiResolver, HttpConnector},
-        server::conn::AddrStream,
-        service::{make_service_fn, service_fn},
-        Body, Request, Response, Server,
+    use {
+        crate::AwsSigV4VerifierService,
+        chrono::{Date, Utc},
+        futures::stream::StreamExt,
+        http::StatusCode,
+        hyper::{
+            client::{connect::dns::GaiResolver, HttpConnector},
+            server::conn::AddrStream,
+            service::{make_service_fn, service_fn},
+            Body, Request, Response, Server,
+        },
+        log::debug,
+        rusoto_core::{DispatchSignedRequest, HttpClient, Region},
+        rusoto_credential::AwsCredentials,
+        rusoto_signature::SignedRequest,
+        scratchstack_aws_principal::PrincipalActor,
+        scratchstack_aws_signature::{
+            get_signing_key_fn, GetSigningKeyRequest, SignatureError, SigningKey, SigningKeyKind,
+        },
+        std::{
+            convert::Infallible,
+            future::Future,
+            net::{Ipv6Addr, SocketAddr, SocketAddrV6},
+            pin::Pin,
+            task::{Context, Poll},
+            time::Duration,
+        },
+        test_env_log, tokio,
+        tower::{BoxError, Service},
     };
-    use log::debug;
-    use rusoto_core::{DispatchSignedRequest, HttpClient, Region};
-    use rusoto_credential::AwsCredentials;
-    use rusoto_signature::SignedRequest;
-    use scratchstack_aws_principal::PrincipalActor;
-    use scratchstack_aws_signature::{
-        get_signing_key_fn, GetSigningKeyRequest, SignatureError, SigningKey, SigningKeyKind,
-    };
-    use std::{
-        convert::Infallible,
-        future::Future,
-        net::{Ipv6Addr, SocketAddr, SocketAddrV6},
-        pin::Pin,
-        task::{Context, Poll},
-        time::Duration,
-    };
-    use test_env_log;
-    use tokio;
-    use tower::{BoxError, Service};
 
     #[test_log::test(tokio::test)]
     async fn test_fn_wrapper() {
@@ -210,7 +211,7 @@ mod tests {
             Ok((principal, k_secret.derive(signing_key_kind, &request_date, region, service)))
         } else {
             Err(SignatureError::UnknownAccessKey {
-                access_key: access_key,
+                access_key,
             }
             .into())
         }
diff --git a/hyper-integration/src/service.rs b/hyper-integration/src/service.rs
@@ -1,23 +1,25 @@
-use chrono::Duration;
-use futures::stream::StreamExt;
-use http::request::Parts;
-use hyper::{
-    body::{Body, Bytes},
-    Error as HyperError, Request, Response,
+use {
+    chrono::Duration,
+    futures::stream::StreamExt,
+    http::request::Parts,
+    hyper::{
+        body::{Body, Bytes},
+        Error as HyperError, Request, Response,
+    },
+    log::{debug, warn},
+    scratchstack_aws_principal::PrincipalActor,
+    scratchstack_aws_signature::{
+        sigv4_verify, GetSigningKeyRequest, Request as AwsSigVerifyRequest, SigningKey, SigningKeyKind,
+    },
+    std::{
+        any::type_name,
+        fmt::{Debug, Display, Formatter, Result as FmtResult},
+        future::Future,
+        pin::Pin,
+        task::{Context, Poll},
+    },
+    tower::{buffer::Buffer, BoxError, Service, ServiceExt},
 };
-use log::{debug, warn};
-use scratchstack_aws_principal::PrincipalActor;
-use scratchstack_aws_signature::{
-    sigv4_verify, GetSigningKeyRequest, Request as AwsSigVerifyRequest, SigningKey, SigningKeyKind,
-};
-use std::{
-    any::type_name,
-    fmt::{Debug, Display, Formatter, Result as FmtResult},
-    future::Future,
-    pin::Pin,
-    task::{Context, Poll},
-};
-use tower::{buffer::Buffer, BoxError, Service, ServiceExt};
 
 /// AWSSigV4VerifierService implements a Hyper service that authenticates a request against AWS SigV4 signing protocol.
 #[derive(Clone)]
diff --git a/rustfmt.toml b/rustfmt.toml
@@ -1,2 +1,15 @@
+edition = "2021"
+force_explicit_abi = true
+fn_params_layout = "Tall"
+hard_tabs = false
+imports_granularity = "One"
 max_width = 120
+merge_derives = true
+newline_style = "Auto"
+remove_nested_parens = true
+reorder_imports = true
+reorder_modules = true
+tab_spaces = 4
+use_field_init_shorthand = true
 use_small_heuristics = "Off"
+use_try_shorthand = true
