scriptoriumadmin/fabro
1
0
Fork 0
mirror of https://github.com/fabro-sh/fabro.git synced 2026-09-16 23:43:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(storage): satisfy clippy in home and artifact paths

Browse source
This commit is contained in:
Bryan Helmkamp 2026-04-06 10:31:08 -04:00
parent f444fc783a
commit 15dcf90763
No known key found for this signature in database
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/crates/fabro-config/src/home.rs
View file

@ -17,9 +17,8 @@ impl Home {
return Self::new(root);
}
let root = dirs::home_dir()
.map(|home| home.join(".fabro"))
.unwrap_or_else(|| PathBuf::from(".fabro"));
let root =
dirs::home_dir().map_or_else(|| PathBuf::from(".fabro"), |home| home.join(".fabro"));
Self::new(root)
}

12
lib/crates/fabro-store/src/artifact_store.rs
View file

@ -104,13 +104,13 @@ impl ArtifactStore {
}
fn run_prefix(&self, run_id: &RunId) -> Result<ObjectPath> {
parse_object_path(self.prefixed_raw(&run_id.to_string()))
parse_object_path(&self.prefixed_raw(&run_id.to_string()))
}
fn node_prefix(&self, run_id: &RunId, node: &StageId) -> Result<ObjectPath> {
let encoded_node = encode_path_segment(node.node_id());
parse_object_path(
self.prefixed_raw(&format!("{run_id}/{encoded_node}@{:04}", node.visit())),
&self.prefixed_raw(&format!("{run_id}/{encoded_node}@{:04}", node.visit())),
)
}
@ -120,7 +120,7 @@ impl ArtifactStore {
raw.push('/');
raw.push_str(&encode_path_segment(segment));
}
parse_object_path(raw)
parse_object_path(&raw)
}
fn prefixed_raw(&self, suffix: &str) -> String {
@ -162,7 +162,7 @@ fn encode_path_segment(segment: &str) -> String {
fn decode_path_segment(kind: &str, value: &str) -> Result<String> {
percent_decode_str(value)
.decode_utf8()
.map(|decoded| decoded.into_owned())
.map(std::borrow::Cow::into_owned)
.map_err(|err| StoreError::Other(format!("invalid {kind}: {err}")))
}
@ -220,8 +220,8 @@ fn decode_filename(prefix: &ObjectPath, location: &ObjectPath) -> Result<String>
Ok(filename_segments.join("/"))
}
fn parse_object_path(raw: String) -> Result<ObjectPath> {
ObjectPath::parse(&raw)
fn parse_object_path(raw: &str) -> Result<ObjectPath> {
ObjectPath::parse(raw)
.map_err(|err| StoreError::Other(format!("invalid artifact object path {raw:?}: {err}")))
}