aboutsummaryrefslogtreecommitdiff
path: root/src/server.rs
diff options
context:
space:
mode:
authorTill Höppner2014-12-26 15:07:47 +0100
committerTill Höppner2014-12-26 15:07:47 +0100
commitd8c9a734419fdfb3ef54bba467f899e09533b3c6 (patch)
treeee18f2a6fa1def91fcaaae53ce708d60f2ad58ac /src/server.rs
parent6ed12a0993d56330bb008adc86bfb5ebe4320583 (diff)
parent2ebcb68cd4c88891f42da1e5c1c29fefea947f23 (diff)
downloadirsc-d8c9a734419fdfb3ef54bba467f899e09533b3c6.tar.gz
irsc-d8c9a734419fdfb3ef54bba467f899e09533b3c6.tar.xz
irsc-d8c9a734419fdfb3ef54bba467f899e09533b3c6.zip
Merge pull request #1 from ravenscroftj/master
Fixed build for irsc
Diffstat (limited to 'src/server.rs')
-rw-r--r--src/server.rs10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/server.rs b/src/server.rs
index 343cdee..4c4479a 100644
--- a/src/server.rs
+++ b/src/server.rs
@@ -7,6 +7,8 @@ use std::io::{
use std::sync::Arc;
use std::sync::Mutex;
+use std::borrow::ToOwned;
+
use callback::Callback;
use event;
use event::Event;
@@ -30,7 +32,7 @@ impl Server {
stream: Arc::new(Mutex::new(None)),
events: {
let mut c = Callback::new();
- c.register(&Server::handle_event);
+ c.register(&(Server::handle_event as fn((Server,Event))));
Arc::new(Mutex::new(c))
}
}
@@ -126,9 +128,9 @@ impl Server {
let cmd = parts.remove(0).unwrap();
let event = Event {
- prefix: prefix.into_string(),
- command: cmd.into_string(),
- content: parts.iter().map(|p| p.into_string()).collect()
+ prefix: prefix.to_owned(),
+ command: cmd.to_owned(),
+ content: parts.into_iter().map(|s| s.to_owned()).collect()
};
self.events.lock().fire(&(self.clone(), event));