Skip to content
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

Jump to bottom

Fix clippy warnings #2108

Merged
merged 2 commits into from Jan 1, 2022
Merged

Fix clippy warnings #2108

merged 2 commits into from Jan 1, 2022

Conversation

rukai
Copy link
Contributor

@rukai rukai commented Dec 23, 2021 •
edited

  • Tested on all platforms changed - Should be no change in functionality.
  • Compilation warnings were addressed
  • cargo fmt has been run on this branch
  • cargo doc builds successfully
  • Added an entry to CHANGELOG.md if knowledge of this change could be valuable to users
  • Updated documentation to reflect any user-facing changes, including notes of platform-specific behavior
  • Created or updated an example program if it would help users understand this functionality
  • Updated feature matrix, if new features were added or implemented

There are still some lints left, but this should be all the non-controversial ones. The rest can be ignored or fixed in a separate PR.

I decided to just ignore new_without_default as it seems really aggressive to me. Happy to just remove the ignore and leave the decision for a follow up PR.

Make sure to review the diff with whitespace disabled to keep the match changes readable.

madsmtm
madsmtm requested changes Dec 24, 2021
View reviewed changes
Copy link
Member

@madsmtm madsmtm left a comment

Choose a reason for hiding this comment

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

Related: #2076.

Quick notes: Agree with most of these, maybe we should enable clippy in CI in the future?

However, I think we should discuss the match changes in the examples: I think there's value in keeping them as-is, because it provides a nice "template" that users can easily copy-paste and extend on. Same goes for winit developers, I think it's useful to be able to easily drop in an extra pattern when debugging an example.

@rukai
Copy link
Contributor Author

rukai commented Dec 24, 2021 •
edited

I think the match changes make sense but happy to roll them back to keep this PR easy to merge.
Which of these changes should I rollback:

  • combining 2 match statements into 1
  • replacing match with if let

?

@madsmtm
Copy link
Member

madsmtm commented Dec 24, 2021

Honestly, can I choose both? At first glance I meant only the match -> if let, but I'm unsure if e.g. examples/mouse_wheel.rs got any clearer by combining the match statements, so I'd like to discuss that as well / at least have it explicitly changed.

@rukai rukai force-pushed the clippy_cleanup branch 2 times, most recently from c4029b2 to 0be7961 Compare December 24, 2021 11:18
@rukai
Copy link
Contributor Author

rukai commented Dec 24, 2021

yep, both was definitely an option!
All the match changes should be reverted now

madsmtm
madsmtm approved these changes Dec 24, 2021
View reviewed changes
Copy link
Member

@madsmtm madsmtm left a comment

Choose a reason for hiding this comment

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

Looked through it all, it looks fine, nice work!

Would it be possible for you to do the same for the other platforms as well?

src/lib.rs Outdated
@@ -131,6 +131,7 @@

#![deny(rust_2018_idioms)]
#![deny(rustdoc::broken_intra_doc_links)]
#![allow(clippy::new_without_default)]
Copy link
Member

Choose a reason for hiding this comment

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

I think it would be fine to have Default impls where it makes sense, at least on public types, but this can be deferred to another PR if it's an issue.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Alright, reverted this so each individual case can be investigated.

src/platform_impl/linux/x11/util/icon.rs
@@ -27,7 +27,7 @@ impl Icon {
data.push(rgba_icon.height as Cardinal);
let pixels = rgba_icon.rgba.as_ptr() as *const Pixel;
for pixel_index in 0..pixel_count {
let pixel = unsafe { &*pixels.offset(pixel_index as isize) };
let pixel = unsafe { &*pixels.add(pixel_index) };
Copy link
Member

Choose a reason for hiding this comment

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

This one scared me for a second (thought it was suddenly trying to use integer addition, which is strictly not the same as pointer offset), but pointer::add is just a convenience for this exact case

@rukai
Copy link
Contributor Author

rukai commented Dec 24, 2021

I do actually have access to macos and windows so im happy to do those as well, but lets land this PR first.

kchibisov
kchibisov requested changes Dec 24, 2021
View reviewed changes
Copy link
Member

@kchibisov kchibisov left a comment

Choose a reason for hiding this comment

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

Thx for the PR. It would be nice to finally resolve this issue #1402.

To test platforms other than your host I could recommend you doing something like cargo +nightly clippy --target=x86_64-pc-windows-msvc --all-targets (this works for like every platform winit supports).

@rukai
Copy link
Contributor Author

rukai commented Dec 24, 2021

If you are happy with the fixes in this PR please land them first.

maroider
maroider suggested changes Dec 24, 2021
View reviewed changes
Copy link
Member

@maroider maroider left a comment

Choose a reason for hiding this comment

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

looks mostly ok to me

src/platform_impl/linux/x11/util/geometry.rs Outdated Show resolved Hide resolved
src/platform_impl/linux/x11/ime/callbacks.rs Show resolved Hide resolved
src/platform_impl/linux/x11/window.rs Outdated Show resolved Hide resolved
maroider
maroider approved these changes Dec 27, 2021
View reviewed changes
Copy link
Member

@maroider maroider left a comment

Choose a reason for hiding this comment

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

It seems like this should be ready to be merged.

I'm assuming adding clippy to our CI config is intended to be added in a separate PR.

@maroider maroider merged commit 0b39024 into rust-windowing:master Jan 1, 2022
@madsmtm madsmtm mentioned this pull request Jun 8, 2022
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kchibisov kchibisov kchibisov requested changes

@madsmtm madsmtm madsmtm approved these changes

@maroider maroider maroider approved these changes

Assignees
No one assigned
Labels
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@rukai @madsmtm @kchibisov @maroider