Use impl_trait_projections

katyo · May 25, 2023 · 3fddbf7 · 3fddbf7
1 parent 17e51e9
commit 3fddbf7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 11 deletions.
diff --git a/embedded-storage-async/src/lib.rs b/embedded-storage-async/src/lib.rs
@@ -5,6 +5,7 @@
 
 #![no_std]
 #![feature(async_fn_in_trait)]
+#![feature(impl_trait_projections)]
 #![allow(incomplete_features)]
 
 pub mod nor_flash;
diff --git a/embedded-storage-async/src/nor_flash.rs b/embedded-storage-async/src/nor_flash.rs
@@ -52,11 +52,7 @@ pub trait NorFlash: ReadNorFlash {
 impl<T: ReadNorFlash> ReadNorFlash for &mut T {
 	const READ_SIZE: usize = T::READ_SIZE;
 
-	async fn read(
-		&mut self,
-		offset: u32,
-		bytes: &mut [u8],
-	) -> Result<(), <&mut T as ErrorType>::Error> {
+	async fn read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error> {
 		T::read(self, offset, bytes).await
 	}
 
@@ -69,15 +65,11 @@ impl<T: NorFlash> NorFlash for &mut T {
 	const WRITE_SIZE: usize = T::WRITE_SIZE;
 	const ERASE_SIZE: usize = T::ERASE_SIZE;
 
-	async fn erase(&mut self, from: u32, to: u32) -> Result<(), <&mut T as ErrorType>::Error> {
+	async fn erase(&mut self, from: u32, to: u32) -> Result<(), Self::Error> {
 		T::erase(self, from, to).await
 	}
 
-	async fn write(
-		&mut self,
-		offset: u32,
-		bytes: &[u8],
-	) -> Result<(), <&mut T as ErrorType>::Error> {
+	async fn write(&mut self, offset: u32, bytes: &[u8]) -> Result<(), Self::Error> {
 		T::write(self, offset, bytes).await
 	}
 }