cargo fmt (#107)

bin/rusty_vault.rs

@@ -8,8 +8,8 @@
 //! [documentation site]: https://www.tongsuo.net
 
 use std::process::ExitCode;
-use clap::{Parser, CommandFactory};
 
+use clap::{CommandFactory, Parser};
 use rusty_vault::cli::Cli;
 
 fn main() -> ExitCode {

build.rs

@@ -1,4 +1,5 @@
-use std::{fs, env, path::Path};
+use std::{env, fs, path::Path};
+
 use toml::Value;
 
 // This is not going to happen any more since we have a default feature definition in Cargo.toml

src/api/client.rs

@@ -1,27 +1,16 @@
-use std::{
-    fs,
-    io::BufReader,
-    sync::Arc,
-    time::Duration,
-    path::PathBuf,
-    collections::HashMap,
-};
+use std::{collections::HashMap, fs, io::BufReader, path::PathBuf, sync::Arc, time::Duration};
 
-use serde_json::{Map, Value};
 use better_default::Default;
-use ureq::AgentBuilder;
 use rustls::{
-    pki_types::{PrivateKeyDer, pem::PemObject},
-    ALL_VERSIONS, ClientConfig, RootCertStore,
+    pki_types::{pem::PemObject, PrivateKeyDer},
+    ClientConfig, RootCertStore, ALL_VERSIONS,
 };
+use serde_json::{Map, Value};
+use ureq::AgentBuilder;
 use webpki_roots::TLS_SERVER_ROOTS;
 
 use super::HttpResponse;
-
-use crate::{
-    errors::RvError,
-    utils::cert::DisabledVerifier,
-};
+use crate::{errors::RvError, utils::cert::DisabledVerifier};
 
 #[derive(Clone)]
 pub struct TLSConfig {
@@ -65,7 +54,11 @@ impl TLSConfigBuilder {
         self
     }
 
-    pub fn with_client_cert_path(mut self, client_cert_path: &PathBuf, client_key_path: &PathBuf) -> Result<Self, RvError> {
+    pub fn with_client_cert_path(
+        mut self,
+        client_cert_path: &PathBuf,
+        client_key_path: &PathBuf,
+    ) -> Result<Self, RvError> {
         let cert_data = fs::read(client_cert_path)?;
         self.client_cert_pem = Some(cert_data);
 
@@ -99,9 +92,7 @@ impl TLSConfigBuilder {
 
         let builder = if self.insecure {
             log::debug!("Certificate verification disabled");
-            builder
-                .dangerous()
-                .with_custom_certificate_verifier(Arc::new(DisabledVerifier))
+            builder.dangerous().with_custom_certificate_verifier(Arc::new(DisabledVerifier))
         } else {
             if let Some(server_ca) = &self.server_ca_pem {
                 let mut cert_reader = BufReader::new(&server_ca[..]);
@@ -111,26 +102,23 @@ impl TLSConfigBuilder {
                 let (_added, _ignored) = root_store.add_parsable_certificates(root_certs);
                 builder.with_root_certificates(root_store)
             } else {
-                let root_store = RootCertStore {
-                    roots: TLS_SERVER_ROOTS.to_vec(),
-                };
+                let root_store = RootCertStore { roots: TLS_SERVER_ROOTS.to_vec() };
                 builder.with_root_certificates(root_store)
             }
         };
 
-        let client_config = if let (Some(client_cert_pem), Some(client_key_pem)) = (&self.client_cert_pem, &self.client_key_pem) {
-            let mut cert_reader = BufReader::new(&client_cert_pem[..]);
-            let client_certs = rustls_pemfile::certs(&mut cert_reader).collect::<Result<Vec<_>, _>>()?;
-            let client_key = PrivateKeyDer::from_pem_slice(client_key_pem)?;
+        let client_config =
+            if let (Some(client_cert_pem), Some(client_key_pem)) = (&self.client_cert_pem, &self.client_key_pem) {
+                let mut cert_reader = BufReader::new(&client_cert_pem[..]);
+                let client_certs = rustls_pemfile::certs(&mut cert_reader).collect::<Result<Vec<_>, _>>()?;
+                let client_key = PrivateKeyDer::from_pem_slice(client_key_pem)?;
 
-            builder.with_client_auth_cert(client_certs, client_key)?
-        } else {
-            builder.with_no_client_auth()
-        };
+                builder.with_client_auth_cert(client_certs, client_key)?
+            } else {
+                builder.with_no_client_auth()
+            };
 
-        Ok(TLSConfig {
-            client_config
-        })
+        Ok(TLSConfig { client_config })
     }
 }
 
@@ -160,9 +148,7 @@ impl Client {
     }
 
     pub fn build(mut self) -> Self {
-        let mut agent = AgentBuilder::new()
-            .timeout_connect(Duration::from_secs(10))
-            .timeout(Duration::from_secs(30));
+        let mut agent = AgentBuilder::new().timeout_connect(Duration::from_secs(10)).timeout(Duration::from_secs(30));
 
         if let Some(tls_config) = &self.tls_config {
             agent = agent.tls_config(Arc::new(tls_config.client_config.clone()));
@@ -172,12 +158,7 @@ impl Client {
         self
     }
 
-    pub fn request(
-        &self,
-        method: &str,
-        path: &str,
-        data: Option<Map<String, Value>>
-    ) -> Result<HttpResponse, RvError> {
+    pub fn request(&self, method: &str, path: &str, data: Option<Map<String, Value>>) -> Result<HttpResponse, RvError> {
         let url = if path.starts_with("/") {
             format!("{}{}", self.address, path)
         } else {
@@ -192,11 +173,7 @@ impl Client {
             req = req.set("X-RustyVault-Token", &self.token);
         }
 
-        let mut ret = HttpResponse {
-            method: method.to_string(),
-            url: url,
-            ..Default::default()
-        };
+        let mut ret = HttpResponse { method: method.to_string(), url, ..Default::default() };
 
         let response_result = if let Some(send_data) = data { req.send_json(send_data) } else { req.call() };
 
@@ -236,18 +213,15 @@ impl Client {
         self.request("GET", path, None)
     }
 
-    pub fn request_write(&self, path: &str, data: Option<Map<String, Value>>,
-    ) -> Result<HttpResponse, RvError> {
+    pub fn request_write(&self, path: &str, data: Option<Map<String, Value>>) -> Result<HttpResponse, RvError> {
         self.request("POST", path, data)
     }
 
-    pub fn request_put(&self, path: &str, data: Option<Map<String, Value>>,
-    ) -> Result<HttpResponse, RvError> {
+    pub fn request_put(&self, path: &str, data: Option<Map<String, Value>>) -> Result<HttpResponse, RvError> {
         self.request("PUT", path, data)
     }
 
-    pub fn request_delete(&self, path: &str, data: Option<Map<String, Value>>,
-    ) -> Result<HttpResponse, RvError> {
+    pub fn request_delete(&self, path: &str, data: Option<Map<String, Value>>) -> Result<HttpResponse, RvError> {
         self.request("DELETE", path, data)
     }
 }

src/api/logical.rs

@@ -2,10 +2,7 @@ use derive_more::Deref;
 use serde_json::{Map, Value};
 
 use super::{Client, HttpResponse};
-
-use crate::{
-    errors::RvError,
-};
+use crate::errors::RvError;
 
 #[derive(Deref)]
 pub struct Logical<'a> {
@@ -15,9 +12,7 @@ pub struct Logical<'a> {
 
 impl Client {
     pub fn logical(&self) -> Logical {
-        Logical {
-            client: self
-        }
+        Logical { client: self }
     }
 }
 

src/api/mod.rs

@@ -2,11 +2,11 @@
 
 use serde_json::Value;
 
+pub mod auth;
 pub mod client;
-pub mod sys;
 pub mod logical;
 pub mod secret;
-pub mod auth;
+pub mod sys;
 
 pub use client::Client;
 

src/api/secret.rs

@@ -1,4 +1,5 @@
 use std::collections::HashMap;
+
 use serde::{Deserialize, Serialize};
 use serde_json::{Map, Value};
 
@@ -38,4 +39,4 @@ pub struct SecretAuth {
     pub lease_duration: u32,
     #[serde(default)]
     pub renewable: bool,
-}
+}

src/api/sys.rs

@@ -1,15 +1,9 @@
 use derive_more::Deref;
-use serde_json::json;
+use serde::{Deserialize, Serialize};
+use serde_json::{json, Map, Value};
 
 use super::{secret::SecretAuth, Client, HttpResponse};
-
-use crate::{
-    errors::RvError,
-    http::sys::InitRequest,
-};
-
-use serde::{Deserialize, Serialize};
-use serde_json::{Map, Value};
+use crate::{errors::RvError, http::sys::InitRequest};
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct Secret {
@@ -61,9 +55,7 @@ pub struct Sys<'a> {
 
 impl Client {
     pub fn sys(&self) -> Sys {
-        Sys {
-            client: self
-        }
+        Sys { client: self }
     }
 }
 

src/cli/command/auth_enable.rs

@@ -87,11 +87,7 @@ impl CommandExecutor for Enable {
         match sys.enable_auth(&auth_input) {
             Ok(ret) => match ret.response_status {
                 200 | 204 => {
-                    println!(
-                        "Success! Enabled {} auth method at: {}",
-                        self.method,
-                        auth_input.path
-                    );
+                    println!("Success! Enabled {} auth method at: {}", self.method, auth_input.path);
                 }
                 _ => ret.print_debug_info(),
             },

src/cli/command/auth_list.rs

@@ -3,11 +3,16 @@ use derive_more::Deref;
 use ureq::json;
 
 use crate::{
-    api::sys::MountOutput, cli::command::{self, format::table_data_add_header, CommandExecutor}, errors::RvError
+    api::sys::MountOutput,
+    cli::command::{self, format::table_data_add_header, CommandExecutor},
+    errors::RvError,
 };
 
 #[derive(Parser, Deref)]
-#[command(author, version, about = r#"Lists the enabled auth methods on the RustyVault server. This command also outputs
+#[command(
+    author,
+    version,
+    about = r#"Lists the enabled auth methods on the RustyVault server. This command also outputs
 information about the method including configuration and human-friendly descriptions.
 A TTL of "system" indicates that the system default is in use.
 
@@ -17,7 +22,8 @@ List all enabled auth methods:
 
 List all enabled auth methods with detailed output:
 
-    $ rvault auth list -detailed"#)]
+    $ rvault auth list -detailed"#
+)]
 pub struct List {
     #[deref]
     #[command(flatten, next_help_heading = "HTTP Options")]
@@ -50,8 +56,8 @@ impl CommandExecutor for List {
                             &mount_output.logical_type,
                             &mount_output.accessor,
                             &mount_output.description,
-                            &mount_output.plugin_version]
-                        ));
+                            &mount_output.plugin_version
+                        ]));
                     }
 
                     let data = if self.output.is_format_table() {
@@ -71,4 +77,4 @@ impl CommandExecutor for List {
         }
         Ok(())
     }
-}
+}

src/cli/command/auth_move.rs

@@ -6,8 +6,8 @@ use crate::{
         command::{self, CommandExecutor},
         util,
     },
-    modules::auth::AUTH_ROUTER_PREFIX,
     errors::RvError,
+    modules::auth::AUTH_ROUTER_PREFIX,
 };
 
 #[derive(Parser, Deref)]
@@ -34,13 +34,7 @@ where ns1 and ns2 are child namespaces of the current namespace:
     $ rvault auth move ns1/approle/ ns2/generic/"#
 )]
 pub struct Move {
-    #[arg(
-        index = 1,
-        required = true,
-        next_line_help = false,
-        value_name = "SOURCE",
-        help = r#"The path of source."#
-    )]
+    #[arg(index = 1, required = true, next_line_help = false, value_name = "SOURCE", help = r#"The path of source."#)]
     source: String,
 
     #[arg(

src/cli/command/delete.rs

@@ -1,7 +1,11 @@
 use clap::Parser;
 use derive_more::Deref;
 
-use crate::{cli::command::{self, CommandExecutor}, errors::RvError, rv_error_string};
+use crate::{
+    cli::command::{self, CommandExecutor},
+    errors::RvError,
+    rv_error_string,
+};
 
 #[derive(Parser, Deref)]
 #[command(
@@ -15,10 +19,7 @@ Remove data in the status secret backend:
   $ vault delete secret/my-secret"#
 )]
 pub struct Delete {
-    #[arg(
-        next_line_help = false,
-        value_name = "PATH",
-    )]
+    #[arg(next_line_help = false, value_name = "PATH")]
     path: String,
 
     #[deref]

src/cli/command/list.rs

@@ -1,7 +1,10 @@
 use clap::Parser;
 use derive_more::Deref;
 
-use crate::{errors::RvError, cli::command::{self, CommandExecutor}};
+use crate::{
+    cli::command::{self, CommandExecutor},
+    errors::RvError,
+};
 
 #[derive(Parser, Deref)]
 #[command(
@@ -18,10 +21,7 @@ For a full list of examples and paths, please see the documentation that corresp
 to the secret engine in use. Not all engines support listing."#
 )]
 pub struct List {
-    #[arg(
-        next_line_help = false,
-        value_name = "PATH",
-    )]
+    #[arg(next_line_help = false, value_name = "PATH")]
     path: String,
 
     #[deref]