-
-
Notifications
You must be signed in to change notification settings - Fork 123
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
treewide: update dependencies #60
Conversation
Alright, all warnings are fixed now :) |
What happened that made |
@parasyte if you checkout this branch's first commit you can reproduce the issue:
If someone can figure this one out then we don't need to nuke the SDL example :) |
Oh, wait, I think I figured it out! |
@lovesegfault It looks like you want to use |
@parasyte Correct! Just fixed it :) |
It looks like MSRV in CI also needs to be updated to 1.40.0. https://travis-ci.org/github/parasyte/pixels/jobs/674268632 |
It's on my plate to review. |
This patch was needed to get diff --git a/examples/minimal-sdl2/main.rs b/examples/minimal-sdl2/main.rs
index c4e9135..809f65d 100644
--- a/examples/minimal-sdl2/main.rs
+++ b/examples/minimal-sdl2/main.rs
@@ -31,23 +31,21 @@ fn main() -> Result<(), String> {
let mut world = World::new();
'game_loop: loop {
- while let Some(event) = sdl.poll_events() {
- match event.expect("SDL poll failed") {
- // Close events
- Event::Quit { .. } => break 'game_loop,
- Event::Keyboard(KeyboardEvent {
- key: KeyInfo { keycode: key, .. },
- ..
- }) if key == Keycode::ESCAPE => break 'game_loop,
-
- // Resize the window
- Event::Window(WindowEvent {
- event: WindowEventEnum::Resized { w, h },
- ..
- }) => pixels.resize(w as u32, h as u32),
-
- _ => (),
- }
+ match sdl.poll_events().and_then(Result::ok) {
+ // Close events
+ Some(Event::Quit { .. }) => break 'game_loop,
+ Some(Event::Keyboard(KeyboardEvent {
+ key: KeyInfo { keycode: key, .. },
+ ..
+ })) if key == Keycode::ESCAPE => break 'game_loop,
+
+ // Resize the window
+ Some(Event::Window(WindowEvent {
+ event: WindowEventEnum::Resized { w, h },
+ ..
+ })) => pixels.resize(w as u32, h as u32),
+
+ _ => (),
}
// Update internal state |
@parasyte Patch applied :) |
This is great! After merging, I'll followup by moving the examples to individual crates to fix the dependency bloat problem wrt. #62 |
This updates all of
pixels
's dependencies. Most importantly, it gets us winit 0.22 and wgpu 0.5.0.This was done in a best-effort way, as I sometimes wasn't entire sure how to get things to work. There's a nasty transmute I want to get rid off, but couldn't figure out how. Figured I'd open the PR to get some ideas.