ok/jj
1
0
Fork 0
forked from mirrors/jj
Code Pull requests Activity

style: use helper instead of buiding UserError by hand

Browse source
This commit is contained in:
Samuel Tardieu 2023-02-05 19:54:16 +01:00
parent a7e2c06068
commit 39226fc127
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/commands/mod.rs
View file

@ -3146,14 +3146,10 @@ fn cmd_workspace_root(
_args: &WorkspaceRootArgs, _args: &WorkspaceRootArgs,
) -> Result<(), CommandError> { ) -> Result<(), CommandError> {
let workspace_command = command.workspace_helper(ui)?; let workspace_command = command.workspace_helper(ui)?;
let root = let root = workspace_command
workspace_command .workspace_root()
.workspace_root() .to_str()
.to_str() .ok_or_else(|| user_error("The workspace root is not valid UTF-8"))?;
.ok_or_else(|| CommandError::UserError {
message: String::from("The workspace root is not valid UTF-8"),
hint: None,
})?;
writeln!(ui, "{root}")?; writeln!(ui, "{root}")?;
Ok(()) Ok(())
} }