From 687cea3f0ac578f93b5105f0c4d88fbdc5ac5ce1 Mon Sep 17 00:00:00 2001
From: Mahdi Robatipoor <mahdi.robatipoor@gmail.com>
Date: Sat, 2 Nov 2019 01:04:42 +0330
Subject: [PATCH] refactor get servers from ArgMatches

---
 src/cmd/delete.rs | 13 +++++--------
 src/cmd/get.rs    | 13 +++++--------
 src/cmd/search.rs | 13 +++++--------
 src/cmd/set.rs    | 13 +++++--------
 4 files changed, 20 insertions(+), 32 deletions(-)

diff --git a/src/cmd/delete.rs b/src/cmd/delete.rs
index 10bee7f..773fdea 100644
--- a/src/cmd/delete.rs
+++ b/src/cmd/delete.rs
@@ -7,14 +7,11 @@ pub fn run_delete_cli(matches: &ArgMatches) -> Result<(), String> {
     set_log_level();
     env_logger::init();
 
-    let mut servers = vec![];
-    if let Some(addr_vec) = matches.values_of("SERVERS") {
-        addr_vec
-            .map(|addr| {
-                servers.push(create_client(addr));
-            })
-            .count();
-    }
+    let servers: Vec<_> = matches
+        .values_of("SERVERS")
+        .unwrap()
+        .map(|addr| create_client(addr))
+        .collect();
 
     let key = matches.value_of("KEY").unwrap();
 
diff --git a/src/cmd/get.rs b/src/cmd/get.rs
index c5085be..6ea98cf 100644
--- a/src/cmd/get.rs
+++ b/src/cmd/get.rs
@@ -7,14 +7,11 @@ pub fn run_get_cli(matches: &ArgMatches) -> Result<(), String> {
     set_log_level();
     env_logger::init();
 
-    let mut servers = vec![];
-    if let Some(addr_vec) = matches.values_of("SERVERS") {
-        addr_vec
-            .map(|addr| {
-                servers.push(create_client(addr));
-            })
-            .count();
-    }
+    let servers: Vec<_> = matches
+        .values_of("SERVERS")
+        .unwrap()
+        .map(|addr| create_client(addr))
+        .collect();
 
     let key = matches.value_of("KEY").unwrap();
 
diff --git a/src/cmd/search.rs b/src/cmd/search.rs
index 1eec3d1..50afb0f 100644
--- a/src/cmd/search.rs
+++ b/src/cmd/search.rs
@@ -7,14 +7,11 @@ pub fn run_search_cli(matches: &ArgMatches) -> Result<(), String> {
     set_log_level();
     env_logger::init();
 
-    let mut servers = vec![];
-    if let Some(addr_vec) = matches.values_of("SERVERS") {
-        addr_vec
-            .map(|addr| {
-                servers.push(create_client(addr));
-            })
-            .count();
-    }
+   let servers: Vec<_> = matches
+        .values_of("SERVERS")
+        .unwrap()
+        .map(|addr| create_client(addr))
+        .collect();
 
     let query = matches.value_of("QUERY").unwrap();
 
diff --git a/src/cmd/set.rs b/src/cmd/set.rs
index 5251f85..20feb98 100644
--- a/src/cmd/set.rs
+++ b/src/cmd/set.rs
@@ -7,14 +7,11 @@ pub fn run_set_cli(matches: &ArgMatches) -> Result<(), String> {
     set_log_level();
     env_logger::init();
 
-    let mut servers = vec![];
-    if let Some(addr_vec) = matches.values_of("SERVERS") {
-        addr_vec
-            .map(|addr| {
-                servers.push(create_client(addr));
-            })
-            .count();
-    }
+    let servers: Vec<_> = matches
+        .values_of("SERVERS")
+        .unwrap()
+        .map(|addr| create_client(addr))
+        .collect();
 
     let key = matches.value_of("KEY").unwrap();
     let value = matches.value_of("VALUE").unwrap();