From 102d793f74c09c6f184e2225d86f2985fcfa0802 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Fri, 1 Sep 2017 22:06:45 +0200 Subject: [PATCH] Fix some rust warnings --- demo/rust/src/implementation/fibonacci.rs | 4 +--- demo/rust/src/implementation/processes.rs | 12 ++++++------ demo/rust/src/implementation/time_series.rs | 4 +--- 3 files changed, 8 insertions(+), 12 deletions(-) diff --git a/demo/rust/src/implementation/fibonacci.rs b/demo/rust/src/implementation/fibonacci.rs index 77981b6..10d4181 100644 --- a/demo/rust/src/implementation/fibonacci.rs +++ b/demo/rust/src/implementation/fibonacci.rs @@ -61,14 +61,12 @@ impl FibonacciTrait for Fibonacci { pub struct FibonacciList { emit: FibonacciListEmitter, - model: FibonacciListList, } impl FibonacciListTrait for FibonacciList { - fn create(emit: FibonacciListEmitter, model: FibonacciListList) -> FibonacciList { + fn create(emit: FibonacciListEmitter, _: FibonacciListList) -> FibonacciList { FibonacciList { emit: emit, - model: model, } } fn emit(&self) -> &FibonacciListEmitter { diff --git a/demo/rust/src/implementation/processes.rs b/demo/rust/src/implementation/processes.rs index 1a9221f..9037e89 100644 --- a/demo/rust/src/implementation/processes.rs +++ b/demo/rust/src/implementation/processes.rs @@ -114,7 +114,7 @@ fn update_thread( emit: ProcessesEmitter, incoming: Arc>>, mut active: bool, - statusChannel: Receiver, + status_channel: Receiver, ) { thread::spawn(move || { loop { @@ -124,7 +124,7 @@ fn update_thread( emit.new_data_ready(None); timeout = Duration::from_secs(1); } - match statusChannel.recv_timeout(timeout) { + match status_channel.recv_timeout(timeout) { Err(RecvTimeoutError::Timeout) => {}, Err(RecvTimeoutError::Disconnected) => { return; }, Ok(ChangeState::Active) => { active = true; }, @@ -399,16 +399,16 @@ impl ProcessesTrait for Processes { if self.active != active { self.active = active; if active { - self.channel.send(ChangeState::Active); + self.channel.send(ChangeState::Active) } else { - self.channel.send(ChangeState::Inactive); - } + self.channel.send(ChangeState::Inactive) + }.expect("Process thread died."); } } } impl Drop for Processes { fn drop(&mut self) { - self.channel.send(ChangeState::Quit); + self.channel.send(ChangeState::Quit).expect("Process thread died."); } } diff --git a/demo/rust/src/implementation/time_series.rs b/demo/rust/src/implementation/time_series.rs index 3b3d412..ba97a7c 100644 --- a/demo/rust/src/implementation/time_series.rs +++ b/demo/rust/src/implementation/time_series.rs @@ -8,15 +8,13 @@ struct TimeSeriesItem { pub struct TimeSeries { emit: TimeSeriesEmitter, - model: TimeSeriesList, list: Vec, } impl TimeSeriesTrait for TimeSeries { - fn create(emit: TimeSeriesEmitter, model: TimeSeriesList) -> TimeSeries { + fn create(emit: TimeSeriesEmitter, _: TimeSeriesList) -> TimeSeries { let mut series = TimeSeries { emit: emit, - model: model, list: Vec::new(), }; for i in 0..100 {