mirror of
https://github.com/qwjyh/xdbm
synced 2025-07-12 17:49:19 +09:00
remove unnecessary arguments for StorageExt::mount_path
This commit is contained in:
parent
ed43d819d6
commit
0e8bd6b4c7
7 changed files with 14 additions and 19 deletions
|
@ -1,12 +1,8 @@
|
|||
//! Manipulate subdirectories of other storages, including directories.
|
||||
|
||||
use anyhow::{anyhow, Context, Result};
|
||||
use anyhow::{Context, Result};
|
||||
use serde::{Deserialize, Serialize};
|
||||
use std::{
|
||||
collections::HashMap,
|
||||
fmt::{self, format},
|
||||
path,
|
||||
};
|
||||
use std::{collections::HashMap, fmt, path};
|
||||
|
||||
use crate::devices;
|
||||
use crate::util;
|
||||
|
@ -84,7 +80,7 @@ impl Directory {
|
|||
let parent_mount_path = self
|
||||
.parent(&storages)
|
||||
.context("Can't find parent storage")?
|
||||
.mount_path(&device, &storages)?;
|
||||
.mount_path(&device)?;
|
||||
Ok(parent_mount_path.join(self.relative_path.clone()))
|
||||
}
|
||||
}
|
||||
|
@ -102,7 +98,7 @@ impl StorageExt for Directory {
|
|||
self.local_infos.get(&device.name())
|
||||
}
|
||||
|
||||
fn mount_path(&self, device: &devices::Device, storages: &Storages) -> Result<path::PathBuf> {
|
||||
fn mount_path(&self, device: &devices::Device) -> Result<path::PathBuf> {
|
||||
Ok(self
|
||||
.local_infos
|
||||
.get(&device.name())
|
||||
|
@ -197,7 +193,7 @@ mod test {
|
|||
storages
|
||||
.get(&"test_name".to_string())
|
||||
.unwrap()
|
||||
.mount_path(&device, &storages)
|
||||
.mount_path(&device)
|
||||
.unwrap(),
|
||||
PathBuf::from("/mnt/sample/subdir")
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue