diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-09 01:37:57 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2020-01-09 01:37:57 +0100 |
| commit | a4e833e860c41796d491ab43e84239fcca1f303d (patch) | |
| tree | c41ab304ffaf2dc2311c7d33916cd0515114ad31 /winit | |
| parent | 2ff0e48142c302cb93130164d083589bb2ac4979 (diff) | |
| parent | cc529a1803972604b122c19c0104e71532fff993 (diff) | |
| download | iced-a4e833e860c41796d491ab43e84239fcca1f303d.tar.gz iced-a4e833e860c41796d491ab43e84239fcca1f303d.tar.bz2 iced-a4e833e860c41796d491ab43e84239fcca1f303d.zip | |
Merge branch 'master' into feature/shrink-by-default
Diffstat (limited to 'winit')
| -rw-r--r-- | winit/src/conversion.rs | 3 | ||||
| -rw-r--r-- | winit/src/debug/basic.rs | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/winit/src/conversion.rs b/winit/src/conversion.rs index 0537d853..279b975a 100644 --- a/winit/src/conversion.rs +++ b/winit/src/conversion.rs @@ -50,7 +50,8 @@ pub fn button_state(element_state: winit::event::ElementState) -> ButtonState { } } -/// Convert some `ModifiersState` from [`winit`] to an [`iced_native`] modifiers state. +/// Convert some `ModifiersState` from [`winit`] to an [`iced_native`] modifiers +/// state. /// /// [`winit`]: https://github.com/rust-windowing/winit /// [`iced_native`]: https://github.com/hecrj/iced/tree/master/native diff --git a/winit/src/debug/basic.rs b/winit/src/debug/basic.rs index c9da392c..d46edba6 100644 --- a/winit/src/debug/basic.rs +++ b/winit/src/debug/basic.rs @@ -1,5 +1,4 @@ -use std::collections::VecDeque; -use std::time; +use std::{collections::VecDeque, time}; #[derive(Debug)] pub struct Debug { |