mirrors/eza
1
0
Fork 0
mirror of https://github.com/eza-community/eza.git synced 2025-07-07 19:35:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

style(rust): unbreak formatting

Browse source 
Signed-off-by: Christina Sørensen <ces@fem.gg>
This commit is contained in:
Christina Sørensen 2025-05-01 17:56:30 +02:00 • committed by Christina Sørensen
parent 92c9408cce
commit 3715dc30a8
4 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

5
.config/treefmt.nix
View file

@ -6,7 +6,8 @@
nixfmt.enable = true; # nix nixfmt.enable = true; # nix
statix.enable = true; # nix static analysis statix.enable = true; # nix static analysis
deadnix.enable = true; # find dead nix code deadnix.enable = true; # find dead nix code
rustfmt.enable = true; # rust # TODO https://github.com/numtide/treefmt-nix/issues/343
#rustfmt.enable = true; # rust
shellcheck.enable = true; # bash/shell shellcheck.enable = true; # bash/shell
taplo.enable = true; # toml taplo.enable = true; # toml
yamlfmt.enable = true; # yaml yamlfmt.enable = true; # yaml
@ -20,7 +21,7 @@
]; ];
excludes = [ ".envrc" ]; excludes = [ ".envrc" ];
}; };
rustfmt.excludes = [ "src/options/flags.rs" ]; #rustfmt.excludes = [ "src/options/flags.rs" ];
taplo.excludes = [ "tests/ptests/*.toml" ]; taplo.excludes = [ "tests/ptests/*.toml" ];
yamlfmt.excludes = [ "./powertest.yaml" ]; yamlfmt.excludes = [ "./powertest.yaml" ];
}; };

2
src/fs/feature/git.rs
View file

@ -388,7 +388,7 @@ fn current_branch(repo: &git2::Repository) -> Option<String> {
if e.code() == git2::ErrorCode::UnbornBranch if e.code() == git2::ErrorCode::UnbornBranch
|| e.code() == git2::ErrorCode::NotFound => || e.code() == git2::ErrorCode::NotFound =>
{ {
return None return None;
} }
Err(e) => { Err(e) => {
error!("Error looking up Git branch: {:?}", e); error!("Error looking up Git branch: {:?}", e);

2
src/options/mod.rs
View file

@ -204,7 +204,7 @@ impl Options {
.is_some() .is_some()
{ {
return Err(OptionsError::Unsupported(String::from( return Err(OptionsError::Unsupported(String::from(
"Options --git and --git-ignore can't be used because `git` feature was disabled in this build of exa" "Options --git and --git-ignore can't be used because `git` feature was disabled in this build of exa",
))); )));
} }
let view = View::deduce(matches, vars)?; let view = View::deduce(matches, vars)?;

2
src/output/render/blocks.rs
View file

@ -45,7 +45,7 @@ impl f::Blocksize {
let (prefix, n) = match result { let (prefix, n) = match result {
NumberPrefix::Standalone(b) => { NumberPrefix::Standalone(b) => {
return TextCell::paint(colours.blocksize(None), numerics.format_int(b)) return TextCell::paint(colours.blocksize(None), numerics.format_int(b));
} }
NumberPrefix::Prefixed(p, n) => (p, n), NumberPrefix::Prefixed(p, n) => (p, n),
}; };