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

async/i2c: fix lifetimes on transaction() #363

Merged
merged 1 commit into from
Feb 15, 2022
Merged
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
22 changes: 12 additions & 10 deletions embedded-hal-async/src/i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,9 +107,10 @@ pub trait I2c<A: AddressMode = SevenBitAddress>: ErrorType {
) -> Self::WriteReadFuture<'a>;

/// Future returned by the `transaction` method.
type TransactionFuture<'a>: Future<Output = Result<(), Self::Error>> + 'a
type TransactionFuture<'a, 'b>: Future<Output = Result<(), Self::Error>> + 'a
where
Self: 'a;
Self: 'a,
'b: 'a;

/// Execute the provided operations on the I2C bus as a single transaction.
///
Expand All @@ -124,11 +125,11 @@ pub trait I2c<A: AddressMode = SevenBitAddress>: ErrorType {
/// - `SAD+R/W` = slave address followed by bit 1 to indicate reading or 0 to indicate writing
/// - `SR` = repeated start condition
/// - `SP` = stop condition
fn transaction<'a>(
fn transaction<'a, 'b>(
&'a mut self,
address: A,
operations: &mut [Operation<'a>],
) -> Self::TransactionFuture<'a>;
operations: &'a mut [Operation<'b>],
) -> Self::TransactionFuture<'a, 'b>;
}

impl<A: AddressMode, T: I2c<A>> I2c<A> for &mut T {
Expand Down Expand Up @@ -164,16 +165,17 @@ impl<A: AddressMode, T: I2c<A>> I2c<A> for &mut T {
T::write_read(self, address, bytes, buffer)
}

type TransactionFuture<'a>
type TransactionFuture<'a, 'b>
where
Self: 'a,
= T::TransactionFuture<'a>;
'b: 'a,
= T::TransactionFuture<'a, 'b>;

fn transaction<'a>(
fn transaction<'a, 'b>(
&'a mut self,
address: A,
operations: &mut [Operation<'a>],
) -> Self::TransactionFuture<'a> {
operations: &'a mut [Operation<'b>],
) -> Self::TransactionFuture<'a, 'b> {
T::transaction(self, address, operations)
}
}
2 changes: 1 addition & 1 deletion src/i2c.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,7 +244,7 @@ impl<T: ErrorType> ErrorType for &mut T {
/// Address mode (7-bit / 10-bit)
///
/// Note: This trait is sealed and should not be implemented outside of this crate.
pub trait AddressMode: private::Sealed {}
pub trait AddressMode: private::Sealed + 'static {}

/// 7-bit address mode type
pub type SevenBitAddress = u8;
Expand Down