From 7dfc9413136e2b239000b102b0b32fd05c0777f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Mon, 7 Dec 2020 19:01:35 +0100 Subject: [PATCH 1/3] fix format --- .../render_resource_bindings.rs | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs b/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs index 8b1953c3bc3f8..e02ce2661ebc8 100644 --- a/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs +++ b/crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs @@ -36,10 +36,13 @@ impl RenderResourceBinding { } pub fn is_dynamic_buffer(&self) -> bool { - matches!(self, RenderResourceBinding::Buffer { - dynamic_index: Some(_), - .. - }) + matches!( + self, + RenderResourceBinding::Buffer { + dynamic_index: Some(_), + .. + } + ) } pub fn get_sampler(&self) -> Option { @@ -239,10 +242,13 @@ impl RenderResourceBindings { self.bindings .iter() .filter(|(_, binding)| { - matches!(binding, RenderResourceBinding::Buffer { - dynamic_index: Some(_), - .. - }) + matches!( + binding, + RenderResourceBinding::Buffer { + dynamic_index: Some(_), + .. + } + ) }) .map(|(name, _)| name.as_str()) } From 47906a7caba6ece309492f28913e253bb0b0991f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Mon, 7 Dec 2020 19:01:41 +0100 Subject: [PATCH 2/3] fix clippy --- crates/bevy_winit/src/lib.rs | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/crates/bevy_winit/src/lib.rs b/crates/bevy_winit/src/lib.rs index 62a9cda2c2f33..0b6940b01680c 100644 --- a/crates/bevy_winit/src/lib.rs +++ b/crates/bevy_winit/src/lib.rs @@ -342,14 +342,15 @@ pub fn winit_runner(mut app: App) { } _ => {} }, - event::Event::DeviceEvent { ref event, .. } => { - if let DeviceEvent::MouseMotion { delta } = event { - let mut mouse_motion_events = - app.resources.get_mut::>().unwrap(); - mouse_motion_events.send(MouseMotion { - delta: Vec2::new(delta.0 as f32, delta.1 as f32), - }); - } + event::Event::DeviceEvent { + event: DeviceEvent::MouseMotion { delta }, + .. + } => { + let mut mouse_motion_events = + app.resources.get_mut::>().unwrap(); + mouse_motion_events.send(MouseMotion { + delta: Vec2::new(delta.0 as f32, delta.1 as f32), + }); } event::Event::MainEventsCleared => { handle_create_window_events( From f03369760aec5343a119d61da0607a0f8b197e06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Mockers?= Date: Mon, 7 Dec 2020 19:01:54 +0100 Subject: [PATCH 3/3] used fixed nightly --- .github/workflows/ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 6f03573372277..a658d35e7f0ef 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -103,7 +103,7 @@ jobs: - uses: actions-rs/toolchain@v1 with: - toolchain: nightly + toolchain: nightly-2020-12-07 components: rustfmt, clippy override: true @@ -114,7 +114,7 @@ jobs: run: sudo apt-get update; sudo apt-get install --no-install-recommends libudev-dev - name: Check the format - run: cargo +nightly fmt --all -- --check + run: cargo +nightly-2020-12-07 fmt --all -- --check # type complexity must be ignored because we use huge templates for queries # -A clippy::manual-strip: strip_prefix support was added in 1.45. we want to support earlier rust versions