vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some clippy warnings

This commit is contained in:
Drakulix 2017-04-26 20:19:57 +02:00
parent f7d3b3dee3
commit a2f3b2a303
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/backend/libinput.rs
View File

@ -264,7 +264,7 @@ impl backend::InputBackend for LibinputInputBackend {
info!(self.logger, "New input handler set."); info!(self.logger, "New input handler set.");
for seat in self.seats.values() { for seat in self.seats.values() {
trace!(self.logger, "Calling on_seat_created with {:?}", seat); trace!(self.logger, "Calling on_seat_created with {:?}", seat);
handler.on_seat_created(&seat); handler.on_seat_created(seat);
} }
self.handler = Some(Box::new(handler)); self.handler = Some(Box::new(handler));
} }
@ -279,7 +279,7 @@ impl backend::InputBackend for LibinputInputBackend {
if let Some(mut handler) = self.handler.take() { if let Some(mut handler) = self.handler.take() {
for seat in self.seats.values() { for seat in self.seats.values() {
trace!(self.logger, "Calling on_seat_destroyed with {:?}", seat); trace!(self.logger, "Calling on_seat_destroyed with {:?}", seat);
handler.on_seat_destroyed(&seat); handler.on_seat_destroyed(seat);
} }
info!(self.logger, "Removing input handler"); info!(self.logger, "Removing input handler");
} }
@ -322,7 +322,7 @@ impl backend::InputBackend for LibinputInputBackend {
} }
if let Some(ref mut handler) = self.handler { if let Some(ref mut handler) = self.handler {
trace!(self.logger, "Calling on_seat_changed with {:?}", old_seat); trace!(self.logger, "Calling on_seat_changed with {:?}", old_seat);
handler.on_seat_changed(&old_seat); handler.on_seat_changed(old_seat);
} }
} }
Entry::Vacant(seat_entry) => { Entry::Vacant(seat_entry) => {
@ -332,7 +332,7 @@ impl backend::InputBackend for LibinputInputBackend {
new_caps)); new_caps));
if let Some(ref mut handler) = self.handler { if let Some(ref mut handler) = self.handler {
trace!(self.logger, "Calling on_seat_created with {:?}", seat); trace!(self.logger, "Calling on_seat_created with {:?}", seat);
handler.on_seat_created(&seat); handler.on_seat_created(seat);
} }
} }
} }
@ -378,16 +378,14 @@ impl backend::InputBackend for LibinputInputBackend {
} else { } else {
panic!("Seat destroyed that was never created"); panic!("Seat destroyed that was never created");
} }
} else {
// it has, notify about updates // it has, notify about updates
if let Some(ref mut handler) = self.handler { } else if let Some(ref mut handler) = self.handler {
let seat = self.seats.get(&device_seat).unwrap(); let seat = self.seats[&device_seat];
trace!(self.logger, "Calling on_seat_changed with {:?}", seat); trace!(self.logger, "Calling on_seat_changed with {:?}", seat);
handler.on_seat_changed(&seat); handler.on_seat_changed(&seat);
} }
} }
} }
}
if let Some(ref mut handler) = self.handler { if let Some(ref mut handler) = self.handler {
handler.on_input_config_changed(&mut self.devices); handler.on_input_config_changed(&mut self.devices);
} }