Przeglądaj źródła

Added NotFoundError and EmptyError

Lorenz Bung 7 lat temu
rodzic
commit
335723f68b
1 zmienionych plików z 6 dodań i 21 usunięć
  1. 6
    21
      hw9/task1/src/lib.rs

+ 6
- 21
hw9/task1/src/lib.rs Wyświetl plik

@@ -7,34 +7,18 @@ pub fn parse(message: &str) -> Command {
7 7
             match str.next() {
8 8
                 Some("STAGE") => {
9 9
                     let msg = m[6..].trim_left();
10
-
11
-                    /* let mut msg = String::new();
12
-                    while let Some(sub_msg) = s.next() {
13
-                        msg += " ";
14
-                        msg += sub_msg
15
-                    }*/
16 10
                     Command::Stage(msg.to_string())
17 11
                 }
18 12
                 Some("CONTROL") => {
19 13
                     let cmd = m[8..].trim_left();
20
-
21
-                    /*let mut cmd = String::new();
22
-                    while let Some(sub_cmd) = s.next() {
23
-                        cmd += " ";
24
-                        cmd += sub_cmd
25
-                    }*/
26 14
                     Command::Control(cmd.to_string())
27 15
                 }
28
-                Some("RETRIEVE") => {
29
-                    Command::Retrieve
30
-                }
31
-                Some(_) => {
32
-                    Command::Error
33
-                }
34
-                None => panic!("Parse Error")
16
+                Some("RETRIEVE") => { Command::Retrieve }
17
+                Some(_) => { Command::NotFoundError }
18
+                None => { Command::EmptyError }
35 19
             }
36 20
         }
37
-        None => panic!("Parse Error!")
21
+        None => { Command::EmptyError }
38 22
     }
39 23
 }
40 24
 
@@ -42,5 +26,6 @@ pub enum Command {
42 26
     Stage(String),
43 27
     Control(String),
44 28
     Retrieve,
45
-    Error,
29
+    NotFoundError,
30
+    EmptyError,
46 31
 }

Ładowanie…
Anuluj
Zapisz