From e4f4ebaf54bcf659e55ad1bef82720df9a9d7cae Mon Sep 17 00:00:00 2001
From: Masato Imai <mi.imai8080@gmail.com>
Date: Tue, 23 Aug 2022 09:42:29 +0900
Subject: [PATCH] refactoring

---
 src/client.rs | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/client.rs b/src/client.rs
index 3b0866f..fc57920 100644
--- a/src/client.rs
+++ b/src/client.rs
@@ -61,20 +61,15 @@ pub fn start_client(args: Args) {
             let ip = {
                 let mut t_ip = None;
                 for arg in args {
-                    let ip = match *arg {
-                        Node::Operator { kind, lhs, rhs } => {
-                            if kind == NodeKind::ASSIGN {
-                                if lhs.extract_string() == String::from("ip") {
-                                    Some(rhs.extract_string())
-                                } else {
-                                    None
-                                }
-                            } else {
-                                None
+                    let mut ip = None;
+                    if let Ok((kind, lhs, rhs)) = arg.expect_operator() {
+                        if kind == NodeKind::ASSIGN {
+                            if lhs.extract_string() == String::from("ip") {
+                                ip = Some(rhs.extract_string());
                             }
                         }
-                        _ => None,
-                    };
+                    }
+
                     if ip.is_some() {
                         t_ip = ip;
                         break;