format code

Author: ufoscout

src/lib.rs

@@ -1,7 +1,7 @@
+use crate::env_reader::env_var_exists;
 use log::*;
-use std::time::Duration;
 use std::path::Path;
-use crate::env_reader::env_var_exists;
+use std::time::Duration;
 
 pub mod env_reader;
 pub mod sleeper;
@@ -122,22 +122,13 @@ pub fn config_from_env() -> Config {
     Config {
         hosts: crate::env_reader::env_var("WAIT_HOSTS", "".to_string()),
         paths: crate::env_reader::env_var("WAIT_PATHS", "".to_string()),
-        global_timeout: to_int(
-            &legacy_or_new("WAIT_HOSTS_TIMEOUT", "WAIT_TIMEOUT", ""),
-            30,
-        ),
+        global_timeout: to_int(&legacy_or_new("WAIT_HOSTS_TIMEOUT", "WAIT_TIMEOUT", ""), 30),
         tcp_connection_timeout: to_int(
             &crate::env_reader::env_var("WAIT_HOST_CONNECT_TIMEOUT", "".to_string()),
             5,
         ),
-        wait_before: to_int(
-            &legacy_or_new("WAIT_BEFORE_HOSTS", "WAIT_BEFORE", ""),
-            0,
-        ),
-        wait_after: to_int(
-            &legacy_or_new("WAIT_AFTER_HOSTS", "WAIT_AFTER", ""),
-            0,
-        ),
+        wait_before: to_int(&legacy_or_new("WAIT_BEFORE_HOSTS", "WAIT_BEFORE", ""), 0),
+        wait_after: to_int(&legacy_or_new("WAIT_AFTER_HOSTS", "WAIT_AFTER", ""), 0),
         wait_sleep_interval: to_int(
             &crate::env_reader::env_var("WAIT_SLEEP_INTERVAL", "".to_string()),
             1,
@@ -148,7 +139,10 @@ pub fn config_from_env() -> Config {
 fn legacy_or_new(legacy_var_name: &str, var_name: &str, default: &str) -> String {
     let mut temp_value = default.to_string();
     if env_var_exists(legacy_var_name) {
-        warn!("Environment variable [{}] is deprecated. Use [{}] instead.", legacy_var_name, var_name);
+        warn!(
+            "Environment variable [{}] is deprecated. Use [{}] instead.",
+            legacy_var_name, var_name
+        );
         temp_value = crate::env_reader::env_var(legacy_var_name, temp_value);
     }
     temp_value = crate::env_reader::env_var(var_name, temp_value);

tests/integration_test.rs

@@ -1,9 +1,9 @@
 use atomic_counter::AtomicCounter;
+use std::fs::{create_dir_all, File};
 use std::net::{Ipv4Addr, SocketAddrV4, TcpListener};
 use std::time::Instant;
 use std::{thread, time};
 use wait::sleeper::*;
-use std::fs::{create_dir_all, File};
 
 #[test]
 fn should_wait_for_5_seconds_before() {
@@ -12,7 +12,7 @@ fn should_wait_for_5_seconds_before() {
     let mut sleeper = MillisSleeper::default();
     wait::wait(
         &mut sleeper,
-        &new_config("", "",1, wait_for, 0, 1, 1),
+        &new_config("", "", 1, wait_for, 0, 1, 1),
         &mut on_timeout,
     );
     assert!(millis_elapsed(start) >= wait_for)
@@ -62,7 +62,7 @@ fn should_sleep_the_specified_time_between_host_checks() {
     let mut sleeper = MillisSleeper::default();
     wait::wait(
         &mut sleeper,
-        &new_config("198.19.255.255:1", "",2_000, 0, 0, 10, 1),
+        &new_config("198.19.255.255:1", "", 2_000, 0, 0, 10, 1),
         &mut on_timeout,
     );
     let elapsed = millis_elapsed(start);
@@ -76,7 +76,15 @@ fn should_sleep_the_specified_time_between_path_checks() {
     let mut sleeper = MillisSleeper::default();
     wait::wait(
         &mut sleeper,
-        &new_config("", "./target/dsfasdfreworthkjiewuryiwghfsikahfsjfskjf",2_000, 0, 0, 11, 1),
+        &new_config(
+            "",
+            "./target/dsfasdfreworthkjiewuryiwghfsikahfsjfskjf",
+            2_000,
+            0,
+            0,
+            11,
+            1,
+        ),
         &mut on_timeout,
     );
     let elapsed = millis_elapsed(start);
@@ -308,7 +316,6 @@ fn should_wait_for_multiple_hosts_and_paths() {
     assert!(millis_elapsed(start) < timeout + wait_before + wait_after);
 }
 
-
 #[test]
 fn should_fail_if_not_all_hosts_are_available() {
     let timeout = 100;