Fix clippy lints
This commit is contained in:
parent
ce2c795bda
commit
8c74464b0d
2 changed files with 15 additions and 21 deletions
|
|
@ -424,22 +424,19 @@ mod grid {
|
|||
};
|
||||
|
||||
match event {
|
||||
Event::Touch(touch_event) => match touch_event {
|
||||
touch::Event::FingerMoved { .. } => {
|
||||
let message = {
|
||||
*interaction = if is_populated {
|
||||
Interaction::Erasing
|
||||
} else {
|
||||
Interaction::Drawing
|
||||
};
|
||||
|
||||
populate.or(unpopulate)
|
||||
Event::Touch(touch::Event::FingerMoved { .. }) => {
|
||||
let message = {
|
||||
*interaction = if is_populated {
|
||||
Interaction::Erasing
|
||||
} else {
|
||||
Interaction::Drawing
|
||||
};
|
||||
|
||||
(event::Status::Captured, message)
|
||||
}
|
||||
_ => (event::Status::Ignored, None),
|
||||
},
|
||||
populate.or(unpopulate)
|
||||
};
|
||||
|
||||
(event::Status::Captured, message)
|
||||
}
|
||||
Event::Mouse(mouse_event) => match mouse_event {
|
||||
mouse::Event::ButtonPressed(button) => {
|
||||
let message = match button {
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ impl Application for Multitouch {
|
|||
fn update(&mut self, message: Message) -> Command<Message> {
|
||||
match message {
|
||||
Message::FingerPressed { id, position } => {
|
||||
self.state.fingers.insert(id, position.clone());
|
||||
self.state.fingers.insert(id, position);
|
||||
self.state.cache.clear();
|
||||
}
|
||||
Message::FingerLifted { id } => {
|
||||
|
|
@ -94,7 +94,7 @@ impl Application for Multitouch {
|
|||
}
|
||||
}
|
||||
|
||||
impl<'a> canvas::Program<Message> for State {
|
||||
impl canvas::Program<Message> for State {
|
||||
type State = ();
|
||||
|
||||
fn update(
|
||||
|
|
@ -134,11 +134,8 @@ impl<'a> canvas::Program<Message> for State {
|
|||
}
|
||||
|
||||
// Collect tuples of (id, point);
|
||||
let mut zones: Vec<(u64, Point)> = self
|
||||
.fingers
|
||||
.iter()
|
||||
.map(|(id, pt)| (id.0, pt.clone()))
|
||||
.collect();
|
||||
let mut zones: Vec<(u64, Point)> =
|
||||
self.fingers.iter().map(|(id, pt)| (id.0, *pt)).collect();
|
||||
|
||||
// Sort by ID
|
||||
zones.sort_by(|a, b| a.0.partial_cmp(&b.0).unwrap());
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue