Skip to content

Fix ci #1024

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.

Sign up for GitHub

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

Merged
merged 3 commits into from
Dec 7, 2020
Merged

Fix ci #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dfc941
fix format
mockersf Dec 7, 2020
47906a7
fix clippy
mockersf Dec 7, 2020
f033697
used fixed nightly
mockersf Dec 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ jobs:

- uses: actions-rs/toolchain@v1
with:
toolchain: nightly
toolchain: nightly-2020-12-07
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

very good call! the constant breakage is definitely annoying

components: rustfmt, clippy
override: true

Expand All @@ -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
Expand Down
22 changes: 14 additions & 8 deletions crates/bevy_render/src/renderer/render_resource/render_resource_bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<SamplerId> {
Expand Down Expand Up @@ -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())
}
Expand Down
17 changes: 9 additions & 8 deletions crates/bevy_winit/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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::<Events<MouseMotion>>().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::<Events<MouseMotion>>().unwrap();
mouse_motion_events.send(MouseMotion {
delta: Vec2::new(delta.0 as f32, delta.1 as f32),
});
}
event::Event::MainEventsCleared => {
handle_create_window_events(
Expand Down