From d8b0f973b0dea54736b1d3d4bb13494f9a605ee7 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Mon, 17 Nov 2014 14:30:01 +0100 Subject: [PATCH] Reformat sniffer_task.rs. --- components/net/sniffer_task.rs | 47 ++++++++++++++++------------------ 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/components/net/sniffer_task.rs b/components/net/sniffer_task.rs index a39e6fc2beb..9df39e59a51 100644 --- a/components/net/sniffer_task.rs +++ b/components/net/sniffer_task.rs @@ -10,37 +10,34 @@ use resource_task::{LoadResponse}; pub type SnifferTask = Sender; pub fn new_sniffer_task(next_rx: Sender) -> SnifferTask { - let(sen, rec) = channel(); - let builder = TaskBuilder::new().named("SnifferManager"); - builder.spawn(proc(){ - SnifferManager::new(rec).start(next_rx); - }); - sen + let (sen, rec) = channel(); + let builder = TaskBuilder::new().named("SnifferManager"); + builder.spawn(proc() { + SnifferManager::new(rec).start(next_rx); + }); + sen } struct SnifferManager { - data_receiver: Receiver, + data_receiver: Receiver, } impl SnifferManager { - fn new(data_receiver: Receiver ) -> SnifferManager { - SnifferManager { - data_receiver: data_receiver, - } - } -} - -impl SnifferManager { - fn start(&self, next_rx: Sender) { - loop { - match self.data_receiver.try_recv() { - Ok(snif_data) => next_rx.send(snif_data), - Err(e) => { - if e == Disconnected { - break - } + fn new(data_receiver: Receiver) -> SnifferManager { + SnifferManager { + data_receiver: data_receiver, + } + } +} + +impl SnifferManager { + fn start(&self, next_rx: Sender) { + loop { + match self.data_receiver.try_recv() { + Ok(snif_data) => next_rx.send(snif_data), + Err(Disconnected) => break, + Err(_) => (), + } } - } } - } }