Skip to content

Fix compilation error in spi.rs for rust Version 1.73+ #170

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 6 commits into from
Dec 12, 2023
Merged

Fix compilation error in spi.rs for rust Version 1.73+ #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
c14bb7c
Fix unused doc comment compiler warning in rcc.rs
JanekGraff Nov 24, 2023
a103135
Fix invalid reference casting compile error in spi.rs
JanekGraff Nov 24, 2023
b77ec9e
Merge branch 'master' into compile-fix
JanekGraff Nov 24, 2023
36773a3
Update CHANGELOG.md
JanekGraff Nov 24, 2023
563da21
Use core::ptr::addr_of! in spi.rs instead of suppressing the compile …
JanekGraff Dec 9, 2023
ec3e603
fixup! Update CHANGELOG.md
JanekGraff Dec 9, 2023
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 CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

- Wrong mode when using PWM channel 2 of a two-channel timer
- `adc_values` example conversion error
- `invalid_reference_casting` Compilation error in spi.rs for Rust version 1.73+ (
See [PR#112431](https://github.com/rust-lang/rust/pull/112431) for more info)
- `unused_doc_comments` Warning in rcc.rs

## [v0.18.0] - 2021-11-14

Expand Down
2 changes: 1 addition & 1 deletion src/rcc.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ impl RccExt for RCC {
pclk: None,
sysclk: None,
clock_src: SysClkSource::HSI,
/// CRS is only available on devices with HSI48
// CRS is only available on devices with HSI48
#[cfg(any(
feature = "stm32f042",
feature = "stm32f048",
Expand Down
4 changes: 2 additions & 2 deletions src/spi.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ where

fn send_u8(&mut self, byte: u8) {
// NOTE(write_volatile) see note above
unsafe { ptr::write_volatile(&self.spi.dr as *const _ as *mut u8, byte) }
unsafe { ptr::write_volatile(ptr::addr_of!(self.spi.dr) as *mut u8, byte) }
}

fn read_u16(&mut self) -> u16 {
Expand All @@ -423,7 +423,7 @@ where

fn send_u16(&mut self, byte: u16) {
// NOTE(write_volatile) see note above
unsafe { ptr::write_volatile(&self.spi.dr as *const _ as *mut u16, byte) }
unsafe { ptr::write_volatile(ptr::addr_of!(self.spi.dr) as *mut u16, byte) }
}

pub fn release(self) -> (SPI, (SCKPIN, MISOPIN, MOSIPIN)) {
Expand Down