Refactor, reformat imports

Author: michaelklishin

src/cli.rs

@@ -18,7 +18,7 @@ use super::static_urls::*;
 use super::tanzu_cli::tanzu_subcommands;
 use crate::config::PreFlightSettings;
 use crate::output::TableStyle;
-use clap::{Arg, ArgAction, ArgGroup, Command, value_parser};
+use clap::{Arg, ArgAction, ArgGroup, Command, crate_version, value_parser};
 use rabbitmq_http_client::commons::{
     BindingDestinationType, ChannelUseMode, ExchangeType, MessageTransferAcknowledgementMode,
     PolicyTarget, QueueType, SupportedProtocol,
@@ -346,12 +346,12 @@ pub fn parser(pre_flight_settings: PreFlightSettings) -> Command {
     ];
 
     Command::new("rabbitmqadmin")
-        .version(clap::crate_version!())
+        .version(crate_version!())
         .author("The RabbitMQ Core Team")
-        .about(format!("rabbitmqadmin gen 2, version: {}", clap::crate_version!()))
+        .about(format!("rabbitmqadmin gen 2, version: {}", crate_version!()))
         .long_about(format!(
             "RabbitMQ CLI that uses the HTTP API. Version: {}",
-            clap::crate_version!()
+            crate_version!()
         ))
         .infer_subcommands(pre_flight_settings.infer_subcommands)
         .infer_long_args(pre_flight_settings.infer_long_options)

src/config.rs

@@ -19,8 +19,8 @@ use crate::constants::{
 use crate::output::TableStyle;
 use clap::ArgMatches;
 use serde::Deserialize;
-use std::collections::HashMap;
 use std::path::{Path, PathBuf};
+use std::{collections::HashMap, fs, io};
 use thiserror::Error;
 use url::Url;
 
@@ -62,7 +62,7 @@ pub enum ConfigFileError {
     )]
     MissingConfigSection(String),
     #[error(transparent)]
-    IoError(#[from] std::io::Error),
+    IoError(#[from] io::Error),
     #[error("failed to deserialize the config file. Make sure it is valid TOML. Details: {0}")]
     DeserializationError(#[from] toml::de::Error),
 }
@@ -532,7 +532,7 @@ fn from_local_path(path: &Path) -> Result<ConfigurationMap<'_>, ConfigFileError>
 }
 
 fn read_from_local_path(path: &PathBuf) -> Result<ConfigurationMap<'_>, ConfigFileError> {
-    let contents = std::fs::read_to_string(path)?;
+    let contents = fs::read_to_string(path)?;
     toml::from_str(&contents).map_err(ConfigFileError::from)
 }
 

src/errors.rs

@@ -18,6 +18,7 @@ use reqwest::{
     StatusCode,
     header::{HeaderMap, InvalidHeaderValue},
 };
+use std::io;
 use url::Url;
 
 #[derive(thiserror::Error, Debug)]
@@ -39,7 +40,7 @@ pub enum CommandRunError {
         cause: rustls::pki_types::pem::Error,
     },
     #[error("Run into an I/O error when loading a file: {0}")]
-    IoError(std::io::Error),
+    IoError(io::Error),
     #[error(
         "Local TLS certificate file at {local_path} does not exist, cannot be read or passed as a PEM file: {cause}"
     )]
@@ -103,8 +104,8 @@ pub enum CommandRunError {
     Other,
 }
 
-impl From<std::io::Error> for CommandRunError {
-    fn from(value: std::io::Error) -> Self {
+impl From<io::Error> for CommandRunError {
+    fn from(value: io::Error) -> Self {
         CommandRunError::IoError(value)
     }
 }

src/main.rs

@@ -15,10 +15,10 @@
 #![allow(clippy::unnecessary_unwrap)]
 #![allow(clippy::collapsible_if)]
 
-use clap::ArgMatches;
+use clap::{ArgMatches, crate_version};
 use errors::CommandRunError;
-use reqwest::Identity;
-use std::path::PathBuf;
+use reqwest::{Identity, tls::Version as TlsVersion};
+use std::path::{Path, PathBuf};
 use std::{fs, process};
 use sysexits::ExitCode;
 
@@ -185,7 +185,7 @@ fn build_http_client(
     cli: &ArgMatches,
     common_settings: &SharedSettings,
 ) -> Result<HTTPClient, CommandRunError> {
-    let user_agent = format!("rabbitmqadmin-ng {}", clap::crate_version!());
+    let user_agent = format!("rabbitmqadmin-ng {}", crate_version!());
     if should_use_tls(common_settings) {
         let _ = CryptoProvider::install_default(rustls::crypto::aws_lc_rs::default_provider());
 
@@ -202,7 +202,7 @@ fn build_http_client(
             .use_rustls_tls()
             .tls_info(true)
             .tls_sni(true)
-            .min_tls_version(reqwest::tls::Version::TLS_1_2)
+            .min_tls_version(TlsVersion::TLS_1_2)
             .tls_built_in_native_certs(true)
             .tls_built_in_root_certs(true)
             .danger_accept_invalid_certs(disable_peer_verification)
@@ -315,7 +315,7 @@ fn read_pem_file(buf: &PathBuf, file_path: &str) -> Result<Vec<u8>, CommandRunEr
 }
 
 fn validate_certificate_file(path: &str) -> Result<(), CommandRunError> {
-    let path_buf = std::path::Path::new(path);
+    let path_buf = Path::new(path);
 
     if !path_buf.exists() {
         return Err(CommandRunError::CertificateFileNotFound {

src/output.rs

@@ -244,7 +244,7 @@ impl<'a> ResultHandler<'a> {
 
     pub fn single_value_output_with_result<T: fmt::Display>(
         &mut self,
-        result: Result<T, crate::errors::CommandRunError>,
+        result: Result<T, CommandRunError>,
     ) {
         match result {
             Ok(output) => {

src/pre_flight.rs

@@ -12,6 +12,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::env;
+
 /// Represents the two modes of operation for the `rabbitmqadmin` CLI:
 /// interactive (driven by a human) and non-interactive (driven by automation tools).
 #[derive(Debug, Clone, Copy, PartialEq, Eq)]
@@ -53,7 +55,7 @@ pub fn should_infer_long_options() -> bool {
 }
 
 fn is_enabled_in_env(key: &str) -> bool {
-    match std::env::var(key) {
+    match env::var(key) {
         Ok(val) => val.to_lowercase().trim() == "true",
         Err(_) => false,
     }

src/tables.rs

@@ -19,7 +19,7 @@ use rabbitmq_http_client::responses::{
     QuorumCriticalityCheckDetails, SchemaDefinitionSyncStatus,
 };
 use reqwest::StatusCode;
-use std::error::Error;
+use std::{error::Error, fmt};
 use tabled::settings::Panel;
 use tabled::{Table, Tabled};
 use url::Url;
@@ -57,7 +57,7 @@ struct OverviewRow<'a> {
 #[derive(Debug, Tabled)]
 struct RowOfTwo<'a, T>
 where
-    T: ?Sized + std::fmt::Display,
+    T: ?Sized + fmt::Display,
 {
     key: &'a str,
     value: &'a T,

tests/bindings_tests.rs

@@ -13,12 +13,13 @@
 // limitations under the License.
 
 use predicates::prelude::*;
+use std::error::Error;
 
 mod test_helpers;
 use crate::test_helpers::*;
 
 #[test]
-fn test_list_bindings() -> Result<(), Box<dyn std::error::Error>> {
+fn test_list_bindings() -> Result<(), Box<dyn Error>> {
     let vh1 = "rabbitmqadmin.test_list_bindings_1";
     let vh2 = "rabbitmqadmin.test_list_bindings_2";
     let q1 = "new_queue_1";
@@ -103,7 +104,7 @@ fn test_list_bindings() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn test_bindings_list() -> Result<(), Box<dyn std::error::Error>> {
+fn test_bindings_list() -> Result<(), Box<dyn Error>> {
     let vh1 = "rabbitmqadmin.test_bindings_list_1";
     let vh2 = "rabbitmqadmin.test_bindings_list_2";
     let q1 = "new_queue_1";
@@ -202,7 +203,7 @@ fn test_bindings_list() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn test_bindings_delete_idempotently() -> Result<(), Box<dyn std::error::Error>> {
+fn test_bindings_delete_idempotently() -> Result<(), Box<dyn Error>> {
     let vh = "rabbitmqadmin.bindings.test1";
     let source_ex = "test_source_exchange";
     let dest_queue = "test_dest_queue";

tests/channels_tests.rs

@@ -14,16 +14,16 @@
 
 mod test_helpers;
 use crate::test_helpers::*;
-
+use std::error::Error;
 #[test]
-fn test_list_channels1() -> Result<(), Box<dyn std::error::Error>> {
+fn test_list_channels1() -> Result<(), Box<dyn Error>> {
     run_succeeds(["channels", "list"]);
 
     Ok(())
 }
 
 #[test]
-fn test_list_channels2() -> Result<(), Box<dyn std::error::Error>> {
+fn test_list_channels2() -> Result<(), Box<dyn Error>> {
     run_succeeds(["list", "channels"]);
 
     Ok(())

tests/combined_integration_tests.rs

@@ -11,6 +11,8 @@
 // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 // See the License for the specific language governing permissions and
 // limitations under the License.
+use std::env;
+use std::error::Error;
 use std::path;
 use std::path::PathBuf;
 
@@ -21,7 +23,7 @@ use crate::test_helpers::output_includes;
 use test_helpers::{run_fails, run_succeeds};
 
 #[test]
-fn combined_integration_test1() -> Result<(), Box<dyn std::error::Error>> {
+fn combined_integration_test1() -> Result<(), Box<dyn Error>> {
     let vh = "rabbitmqadmin.combined_integration.test1";
     let config_path = path::absolute("./tests/fixtures/config_files/config_file1.conf")
         .expect("failed to compute an absolute version for a ./test/fixtures path");
@@ -46,7 +48,7 @@ fn combined_integration_test1() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn combined_integration_test2() -> Result<(), Box<dyn std::error::Error>> {
+fn combined_integration_test2() -> Result<(), Box<dyn Error>> {
     let vh = "rabbitmqadmin.combined_integration.test2";
 
     // Uses a node alias that does not exist in the file
@@ -77,7 +79,7 @@ fn combined_integration_test2() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn combined_integration_test3() -> Result<(), Box<dyn std::error::Error>> {
+fn combined_integration_test3() -> Result<(), Box<dyn Error>> {
     let vh = "rabbitmqadmin.combined_integration.test3";
 
     // Uses a node alias that does not exist in the file
@@ -97,7 +99,7 @@ fn combined_integration_test3() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn combined_integration_test4() -> Result<(), Box<dyn std::error::Error>> {
+fn combined_integration_test4() -> Result<(), Box<dyn Error>> {
     // This test uses administrative credentials to create a new user
     // and set up a topology using those new credentials
     let vh = "rabbitmqadmin.combined_integration.test4";
@@ -235,11 +237,11 @@ fn combined_integration_test4() -> Result<(), Box<dyn std::error::Error>> {
 // Implementation
 //
 
-fn report_a_missing_config_file(config_path: PathBuf) -> Result<(), Box<dyn std::error::Error>> {
+fn report_a_missing_config_file(config_path: PathBuf) -> Result<(), Box<dyn Error>> {
     println!(
         "{} doesn't exist. Current working directory: {}",
         config_path.to_string_lossy(),
-        std::env::current_dir()?.display()
+        env::current_dir()?.display()
     );
     Ok(())
 }