Update from storage rework PR

Author: MathiasKoch

Cargo.toml

@@ -13,6 +13,3 @@ documentation = "https://docs.rs/embedded-storage"
 readme = "README.md"
 keywords = ["storage"]
 categories = ["embedded", "hardware-support", "no-std"]
-
-[dependencies]
-heapless = "^0.5"

src/lib.rs

@@ -26,7 +26,7 @@ pub trait ReadStorage {
 	/// Read a slice of data from the storage peripheral, starting the read
 	/// operation at the given address offset, and reading `bytes.len()` bytes.
 	///
-	///	This should throw an error in case `bytes.len()` will be larger than
+	/// This should throw an error in case `bytes.len()` will be larger than
 	/// `self.capacity() - offset`.
 	fn try_read(&mut self, offset: u32, bytes: &mut [u8]) -> Result<(), Self::Error>;
 

src/nor_flash.rs

@@ -1,5 +1,3 @@
-use crate::{iter::IterableByOverlaps, ReadStorage, Region, Storage};
-
 /// Read only NOR flash trait.
 pub trait ReadNorFlash {
 	/// An enumeration of storage errors
@@ -54,6 +52,7 @@ pub trait NorFlash: ReadNorFlash {
 /// - Bits that were 0 on flash are guaranteed to stay as 0
 /// - Rest of the bits in the page are guaranteed to be unchanged
 pub trait MultiwriteNorFlash: NorFlash {}
+<<<<<<< HEAD
 
 struct Page {
 	pub start: u32,
@@ -244,3 +243,5 @@ where
 		Ok(())
 	}
 }
+=======
+>>>>>>> storage-rework