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

core: Relax lifetime constraint on msgs in I2CTransfer::transfer() #89

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@ Versioning](https://semver.org/spec/v2.0.0.html).

## [Unreleased]

- Relax lifetime constraint on `I2CTransfer::transfer` `msgs` reference

## [v0.6.1] - 2024-05-09

- Properly ellide the start bit when sending a series of I2C messages as a
Expand Down
2 changes: 1 addition & 1 deletion src/core.rs
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ pub trait I2CTransfer<'a> {
/// Performs multiple serially chained I2C read/write transactions. On
/// success the return code is the number of successfully executed
/// transactions
fn transfer(&mut self, msgs: &'a mut [Self::Message]) -> Result<u32, Self::Error>;
fn transfer(&mut self, msgs: &mut [Self::Message]) -> Result<u32, Self::Error>;
}

/// Read/Write I2C message
Expand Down
4 changes: 2 additions & 2 deletions src/linux.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ impl<'a> I2CTransfer<'a> for LinuxI2CDevice {
type Message = LinuxI2CMessage<'a>;

/// Issue the provided sequence of I2C transactions
fn transfer(&mut self, messages: &'a mut [Self::Message]) -> Result<u32, LinuxI2CError> {
fn transfer(&mut self, messages: &mut [Self::Message]) -> Result<u32, LinuxI2CError> {
let msg_type = |flag: u16| flag & I2CMessageFlags::READ.bits();
let mut prev_msg_type = None;
for msg in messages.iter_mut() {
Expand Down Expand Up @@ -335,7 +335,7 @@ impl<'a> I2CTransfer<'a> for LinuxI2CBus {
type Message = LinuxI2CMessage<'a>;

/// Issue the provided sequence of I2C transactions
fn transfer(&mut self, msgs: &'a mut [Self::Message]) -> Result<u32, LinuxI2CError> {
fn transfer(&mut self, msgs: &mut [Self::Message]) -> Result<u32, LinuxI2CError> {
ffi::i2c_rdwr(self.as_raw_fd(), msgs).map_err(From::from)
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/mock.rs
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,7 @@ where
type Message = MockI2CMessage<'a>;

/// Issue the provided sequence of I2C transactions
fn transfer(&mut self, messages: &'a mut [Self::Message]) -> Result<u32, Self::Error> {
fn transfer(&mut self, messages: &mut [Self::Message]) -> Result<u32, Self::Error> {
for msg in messages.iter_mut() {
match &mut msg.msg_type {
MessageType::Read(data) => self.read(data)?,
Expand Down
Loading