Fix some rust warnings

master
Jos van den Oever 2017-09-01 22:06:45 +02:00
parent c9b2fda4fb
commit 102d793f74
3 changed files with 8 additions and 12 deletions

View File

@ -61,14 +61,12 @@ impl FibonacciTrait for Fibonacci {
pub struct FibonacciList { pub struct FibonacciList {
emit: FibonacciListEmitter, emit: FibonacciListEmitter,
model: FibonacciListList,
} }
impl FibonacciListTrait for FibonacciList { impl FibonacciListTrait for FibonacciList {
fn create(emit: FibonacciListEmitter, model: FibonacciListList) -> FibonacciList { fn create(emit: FibonacciListEmitter, _: FibonacciListList) -> FibonacciList {
FibonacciList { FibonacciList {
emit: emit, emit: emit,
model: model,
} }
} }
fn emit(&self) -> &FibonacciListEmitter { fn emit(&self) -> &FibonacciListEmitter {

View File

@ -114,7 +114,7 @@ fn update_thread(
emit: ProcessesEmitter, emit: ProcessesEmitter,
incoming: Arc<Mutex<Option<ProcessTree>>>, incoming: Arc<Mutex<Option<ProcessTree>>>,
mut active: bool, mut active: bool,
statusChannel: Receiver<ChangeState>, status_channel: Receiver<ChangeState>,
) { ) {
thread::spawn(move || { thread::spawn(move || {
loop { loop {
@ -124,7 +124,7 @@ fn update_thread(
emit.new_data_ready(None); emit.new_data_ready(None);
timeout = Duration::from_secs(1); timeout = Duration::from_secs(1);
} }
match statusChannel.recv_timeout(timeout) { match status_channel.recv_timeout(timeout) {
Err(RecvTimeoutError::Timeout) => {}, Err(RecvTimeoutError::Timeout) => {},
Err(RecvTimeoutError::Disconnected) => { return; }, Err(RecvTimeoutError::Disconnected) => { return; },
Ok(ChangeState::Active) => { active = true; }, Ok(ChangeState::Active) => { active = true; },
@ -399,16 +399,16 @@ impl ProcessesTrait for Processes {
if self.active != active { if self.active != active {
self.active = active; self.active = active;
if active { if active {
self.channel.send(ChangeState::Active); self.channel.send(ChangeState::Active)
} else { } else {
self.channel.send(ChangeState::Inactive); self.channel.send(ChangeState::Inactive)
} }.expect("Process thread died.");
} }
} }
} }
impl Drop for Processes { impl Drop for Processes {
fn drop(&mut self) { fn drop(&mut self) {
self.channel.send(ChangeState::Quit); self.channel.send(ChangeState::Quit).expect("Process thread died.");
} }
} }

View File

@ -8,15 +8,13 @@ struct TimeSeriesItem {
pub struct TimeSeries { pub struct TimeSeries {
emit: TimeSeriesEmitter, emit: TimeSeriesEmitter,
model: TimeSeriesList,
list: Vec<TimeSeriesItem>, list: Vec<TimeSeriesItem>,
} }
impl TimeSeriesTrait for TimeSeries { impl TimeSeriesTrait for TimeSeries {
fn create(emit: TimeSeriesEmitter, model: TimeSeriesList) -> TimeSeries { fn create(emit: TimeSeriesEmitter, _: TimeSeriesList) -> TimeSeries {
let mut series = TimeSeries { let mut series = TimeSeries {
emit: emit, emit: emit,
model: model,
list: Vec::new(), list: Vec::new(),
}; };
for i in 0..100 { for i in 0..100 {