Skip to content

Fix Clippy lints #55

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

Closed
evading wants to merge 1 commit into from
Closed

Fix Clippy lints #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 3 additions & 0 deletions mcan/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@ Tagging in git follows a pattern: `mcan/<version>`.

## [Unreleased]

### Changed
- Fix some Clippy lints related to parenthesization (#55)

## [0.6.0] - 2025-02-04

### Added
Expand Down
19 changes: 12 additions & 7 deletions mcan/src/filter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,7 +230,12 @@ impl From<Filter> for FilterStandardId {
id,
msg_type,
offset,
} => (id.as_raw() as u32) << 16 | (msg_type as u32) << 9 | offset as u32 | (0x7 << 27),
} => {
((id.as_raw() as u32) << 16)
| ((msg_type as u32) << 9)
| offset as u32
| (0x7 << 27)
}
};

FilterStandardId(v)
Expand All @@ -244,12 +249,12 @@ impl From<ExtFilter> for FilterExtendedId {
ExtFilter::MaskedRange { action, high, low } => {
let action: u32 = action.into();

((action << 29 | low.as_raw()), high.as_raw())
((action << 29) | low.as_raw(), high.as_raw())
}
ExtFilter::Dual { action, id1, id2 } => {
let action: u32 = action.into();

((action << 29 | id1.as_raw()), (1 << 30 | id2.as_raw()))
((action << 29) | id1.as_raw(), (1 << 30) | id2.as_raw())
}
ExtFilter::Classic {
action,
Expand All @@ -258,20 +263,20 @@ impl From<ExtFilter> for FilterExtendedId {
} => {
let action: u32 = action.into();

((action << 29 | filter.as_raw()), (2 << 30 | mask.as_raw()))
((action << 29) | filter.as_raw(), (2 << 30) | mask.as_raw())
}
ExtFilter::Range { action, high, low } => {
let action: u32 = action.into();

((action << 29 | low.as_raw()), (3 << 30 | high.as_raw()))
((action << 29) | low.as_raw(), (3 << 30) | high.as_raw())
}
ExtFilter::StoreBuffer {
id,
msg_type,
offset,
} => (
(0x7 << 29 | id.as_raw()),
(msg_type as u32) << 9 | offset as u32,
(0x7 << 29) | id.as_raw(),
((msg_type as u32) << 9) | offset as u32,
),
};
FilterExtendedId([v1, v2])
Expand Down
2 changes: 1 addition & 1 deletion mcan/src/message/tx.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ impl MessageBuilder<'_> {
let efc = self.store_tx_event.is_some();
let mm = self.store_tx_event.unwrap_or(0);

let t0 = id_field | (rtr as u32) << 29 | (xtd as u32) << 30 | (esi as u32) << 31;
let t0 = id_field | ((rtr as u32) << 29) | ((xtd as u32) << 30) | ((esi as u32) << 31);
let t1 = (((dlc & 0xf) as u32) << 16)
| ((brs as u32) << 20)
| ((fdf as u32) << 21)
Expand Down