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.

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

Appease clippy #259

Merged
merged 2 commits into from
Jan 28, 2025
Merged

Appease clippy #259

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d385630
Appease clippy
madsmtm Jan 28, 2025
edbc562
Pin objc2-encode in MSRV
madsmtm Jan 28, 2025
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
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ jobs:
run: |
cargo update -p ahash --precise 0.8.7
cargo update -p bumpalo --precise 3.14.0
cargo update -p objc2-encode --precise 4.0.3
Copy link
Member

Choose a reason for hiding this comment

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

Suggestion to see if we can run cargo +nightly -Zminimal-versions generate-lockfile before doing an MSRV test? I've been doing that on all my repositories and it at the same time ensures the lower bound of all my dependencies are correct/buildable :)

(Assuming there aren't too many different combinations / features / optional dependencies to test, of course)

Copy link
Member Author

Choose a reason for hiding this comment

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

For my part, feel free to try! I only did this now to fix CI.


- name: Build crate
shell: bash
Expand Down
4 changes: 2 additions & 2 deletions examples/drm.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ mod imple {
let planes = planes
.iter()
.filter(|&&plane| {
device.get_plane(plane).map_or(false, |plane| {
device.get_plane(plane).is_ok_and(|plane| {
let crtcs = handles.filter_crtcs(plane.possible_crtcs());
crtcs.contains(&crtc.handle())
})
Expand All @@ -77,7 +77,7 @@ mod imple {
let (ids, vals) = props.as_props_and_values();
for (&id, &val) in ids.iter().zip(vals.iter()) {
if let Ok(info) = device.get_property(id) {
if info.name().to_str().map_or(false, |x| x == "type") {
if info.name().to_str() == Ok("type") {
return val == PlaneType::Primary as u32 as u64;
}
}
Expand Down