mirrors/jj
1
0
Fork 1
mirror of https://github.com/martinvonz/jj.git synced 2024-10-24 23:47:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

diff_utils: return &str from basic_diff_file_type()

Browse source 
We don't currently need an owned `String`.
This commit is contained in:
Martin von Zweigbergk 2023-11-09 22:39:31 -08:00 committed by Martin von Zweigbergk
parent b5909dfc34
commit bf36933d9d
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
cli/src/diff_util.rs
View file

@ -362,22 +362,22 @@ fn diff_content(path: &RepoPath, value: MaterializedTreeValue) -> Result<Vec<u8>
} }
} }
fn basic_diff_file_type(value: &MaterializedTreeValue) -> String { fn basic_diff_file_type(value: &MaterializedTreeValue) -> &'static str {
match value { match value {
MaterializedTreeValue::Absent => { MaterializedTreeValue::Absent => {
panic!("absent path in diff"); panic!("absent path in diff");
} }
MaterializedTreeValue::File { executable, .. } => { MaterializedTreeValue::File { executable, .. } => {
if *executable { if *executable {
"executable file".to_string() "executable file"
} else { } else {
"regular file".to_string() "regular file"
} }
} }
MaterializedTreeValue::Symlink { .. } => "symlink".to_string(), MaterializedTreeValue::Symlink { .. } => "symlink",
MaterializedTreeValue::Tree(_) => "tree".to_string(), MaterializedTreeValue::Tree(_) => "tree",
MaterializedTreeValue::GitSubmodule(_) => "Git submodule".to_string(), MaterializedTreeValue::GitSubmodule(_) => "Git submodule",
MaterializedTreeValue::Conflict { .. } => "conflict".to_string(), MaterializedTreeValue::Conflict { .. } => "conflict",
} }
} }