Redo channels to use messages

src/comm.rs

@@ -1,3 +1,17 @@
 use std::sync::mpsc::{Sender};
 
-pub type Channel = Sender<String>;
+pub type Channel = Sender<Message>;
+
+pub struct Message {
+    pub kind: String,
+    pub text: String
+}
+
+pub fn send(tx: &Channel, kind: &str, text: &str) {
+    tx.send(Message {
+        kind: kind.to_string(),
+        text: text.to_string()
+    })
+    .ok()
+    .expect(&format!("Failed to send message: [{}] {}", kind, text))
+}

src/main.rs

@@ -1,18 +1,24 @@
 mod sensors;
 mod comm;
 
-use comm::Channel;
+use comm::{Channel, Message};
 use std::io;
 use std::sync::mpsc;
 use std::thread;
 
-
 fn main() {
-    let (tx, rx) = mpsc::channel::<String>();
+    let (tx, rx) = mpsc::channel::<Message>();
     make_thread(&tx, stdin);
     make_thread(&tx, sensors::sensors);
+
+    let mut data;
+
     loop {
-        println!("%{{r}}{}", rx.recv().ok().unwrap());
+        let msg = rx.recv().unwrap();
+        match msg {
+            Message { text, .. } => data = text,
+        }
+        println!("%{{r}}{}", data);
     }
 }
 
@@ -27,7 +33,6 @@ fn stdin(tx: &Channel) {
     let mut line = String::new();
     loop {
         io::stdin().read_line(&mut line).ok().expect("Failed to read line");
-        tx.send(line.clone()).ok().expect("Couldn't send data");
     }
 }
 

src/sensors.rs

@@ -1,5 +1,6 @@
 extern crate time;
 
+use comm;
 use comm::Channel;
 use std::fs::File;
 use std::io::prelude::*;
@@ -13,7 +14,7 @@ pub fn sensors(tx: &Channel) {
             datetime()
         ];
 
-        tx.send(format!("{}", reduce(right))).ok().expect("Couldn't send data");
+        comm::send(tx, "sensors", &reduce(right));
         thread::sleep_ms(1000);
     }
 }