small general fixes

Author: fogti

src/fs/mem.rs

@@ -394,19 +394,16 @@ impl RamFile {
 	}
 }
 
+type MemDirectoryMap = BTreeMap<String, Box<dyn VfsNode + core::marker::Send + core::marker::Sync>>;
+
 pub struct MemDirectoryInterface {
 	/// Directory entries
-	inner:
-		Arc<RwLock<BTreeMap<String, Box<dyn VfsNode + core::marker::Send + core::marker::Sync>>>>,
+	inner: Arc<RwLock<MemDirectoryMap>>,
 	read_idx: Mutex<usize>,
 }
 
 impl MemDirectoryInterface {
-	pub fn new(
-		inner: Arc<
-			RwLock<BTreeMap<String, Box<dyn VfsNode + core::marker::Send + core::marker::Sync>>>,
-		>,
-	) -> Self {
+	pub fn new(inner: Arc<RwLock<MemDirectoryMap>>) -> Self {
 		Self {
 			inner,
 			read_idx: Mutex::new(0),
@@ -477,8 +474,7 @@ impl ObjectInterface for MemDirectoryInterface {
 
 #[derive(Debug)]
 pub(crate) struct MemDirectory {
-	inner:
-		Arc<RwLock<BTreeMap<String, Box<dyn VfsNode + core::marker::Send + core::marker::Sync>>>>,
+	inner: Arc<RwLock<MemDirectoryMap>>,
 	attr: FileAttr,
 }
 
@@ -807,15 +803,16 @@ impl VfsNode for MemDirectory {
 		block_on(
 			async {
 				if let Some(component) = components.pop() {
-					let name = String::from(component);
-
 					if components.is_empty() {
 						let file = RomFile::new(data, mode);
-						self.inner.write().await.insert(name, Box::new(file));
+						self.inner
+							.write()
+							.await
+							.insert(component.to_owned(), Box::new(file));
 						return Ok(());
 					}
 
-					if let Some(directory) = self.inner.read().await.get(&name) {
+					if let Some(directory) = self.inner.read().await.get(component) {
 						return directory.traverse_create_file(components, data, mode);
 					}
 				}