taproot-manufacturing/entomologist
2
0
Fork 0
Code Issues 1 Pull requests 2 Projects Releases Packages Wiki Activity Actions

Issue: get rid of all unwraps

Browse source 
Make and return errors instead.
This commit is contained in:
Sebastian Kuzminsky 2025-07-19 09:53:36 -06:00
parent 04b33eb70f
commit 2ba13ebaeb
1 changed files with 27 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

39
src/issue.rs
View file

@ -153,9 +153,9 @@ impl Issue {
} }
} }
if description == None { let Some(description) = description else {
return Err(IssueError::IssueParseError); return Err(IssueError::IssueParseError);
} };
// parse the issue ID from the directory name // parse the issue ID from the directory name
let id = if let Some(parsed_id) = match dir.file_name() { let id = if let Some(parsed_id) = match dir.file_name() {
@ -179,7 +179,7 @@ impl Issue {
state: state, state: state,
dependencies, dependencies,
assignee, assignee,
description: description.unwrap(), description,
comments, comments,
dir: std::path::PathBuf::from(dir), dir: std::path::PathBuf::from(dir),
}) })
@ -267,9 +267,9 @@ impl Issue {
"edit description of issue {}", "edit description of issue {}",
description_filename description_filename
.parent() .parent()
.unwrap() .ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.file_name() .file_name()
.unwrap() .ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.to_string_lossy(), .to_string_lossy(),
))?; ))?;
Ok(()) Ok(())
@ -293,7 +293,10 @@ impl Issue {
write!(state_file, "{}", new_state)?; write!(state_file, "{}", new_state)?;
self.commit(&format!( self.commit(&format!(
"change state of issue {}, {} -> {}", "change state of issue {}, {} -> {}",
self.dir.file_name().unwrap().to_string_lossy(), self.dir
.file_name()
.ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.to_string_lossy(),
old_state, old_state,
new_state, new_state,
))?; ))?;
@ -323,7 +326,10 @@ impl Issue {
self.done_time = Some(done_time.clone()); self.done_time = Some(done_time.clone());
self.commit(&format!( self.commit(&format!(
"set done-time of issue {} to {}", "set done-time of issue {} to {}",
self.dir.file_name().unwrap().to_string_lossy(), self.dir
.file_name()
.ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.to_string_lossy(),
done_time, done_time,
))?; ))?;
Ok(()) Ok(())
@ -341,7 +347,10 @@ impl Issue {
write!(assignee_file, "{}", new_assignee)?; write!(assignee_file, "{}", new_assignee)?;
self.commit(&format!( self.commit(&format!(
"change assignee of issue {}, {} -> {}", "change assignee of issue {}, {} -> {}",
self.dir.file_name().unwrap().to_string_lossy(), self.dir
.file_name()
.ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.to_string_lossy(),
old_assignee, old_assignee,
new_assignee, new_assignee,
))?; ))?;
@ -358,7 +367,10 @@ impl Issue {
self.tags.sort(); self.tags.sort();
self.commit_tags(&format!( self.commit_tags(&format!(
"issue {} add tag {}", "issue {} add tag {}",
self.dir.file_name().unwrap().to_string_lossy(), self.dir
.file_name()
.ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.to_string_lossy(),
tag tag
))?; ))?;
Ok(()) Ok(())
@ -373,7 +385,10 @@ impl Issue {
self.tags.remove(index); self.tags.remove(index);
self.commit_tags(&format!( self.commit_tags(&format!(
"issue {} remove tag {}", "issue {} remove tag {}",
self.dir.file_name().unwrap().to_string_lossy(), self.dir
.file_name()
.ok_or(std::io::Error::from(std::io::ErrorKind::NotFound))?
.to_string_lossy(),
tag tag
))?; ))?;
Ok(()) Ok(())
@ -432,8 +447,8 @@ impl Issue {
.spawn()? .spawn()?
.wait_with_output()?; .wait_with_output()?;
if !result.status.success() { if !result.status.success() {
println!("stdout: {}", std::str::from_utf8(&result.stdout).unwrap()); println!("stdout: {}", &String::from_utf8_lossy(&result.stdout));
println!("stderr: {}", std::str::from_utf8(&result.stderr).unwrap()); println!("stderr: {}", &String::from_utf8_lossy(&result.stderr));
return Err(IssueError::EditorError); return Err(IssueError::EditorError);
} }
if !description_filename.exists() || description_filename.metadata()?.len() == 0 { if !description_filename.exists() || description_filename.metadata()?.len() == 0 {