actions/typos
1
0
Fork 0
mirror of https://github.com/crate-ci/typos.git synced 2024-11-25 18:41:05 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

refactor: extract fix_file_name function

Browse source
This commit is contained in:
Bnyro 2024-10-11 15:30:07 +02:00
parent 6802cc60d4
commit 40926ccba4
1 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
crates/typos-cli/src/file.rs
View file

@ -127,11 +127,7 @@ impl FileChecker for FixTypos {
} }
} }
if !fixes.is_empty() { if !fixes.is_empty() {
let file_name = file_name.to_owned().into_bytes(); let new_path = fix_file_name(path, file_name, fixes.into_iter())?;
let new_name = fix_buffer(file_name, fixes.into_iter());
let new_name =
String::from_utf8(new_name).expect("corrections are valid utf-8");
let new_path = path.with_file_name(new_name);
std::fs::rename(path, new_path)?; std::fs::rename(path, new_path)?;
} }
} }
@ -205,11 +201,7 @@ impl FileChecker for DiffTypos {
} }
} }
if !fixes.is_empty() { if !fixes.is_empty() {
let file_name = file_name.to_owned().into_bytes(); new_path = fix_file_name(path, file_name, fixes.into_iter()).ok();
let new_name = fix_buffer(file_name, fixes.into_iter());
let new_name =
String::from_utf8(new_name).expect("corrections are valid utf-8");
new_path = Some(path.with_file_name(new_name));
} }
} }
} }
@ -650,7 +642,7 @@ fn is_fixable(typo: &typos::Typo<'_>) -> bool {
extract_fix(typo).is_some() extract_fix(typo).is_some()
} }
fn fix_buffer(mut buffer: Vec<u8>, typos: impl Iterator<Item = typos::Typo<'static>>) -> Vec<u8> { fn fix_buffer<'a>(mut buffer: Vec<u8>, typos: impl Iterator<Item = typos::Typo<'a>>) -> Vec<u8> {
let mut offset = 0isize; let mut offset = 0isize;
for typo in typos { for typo in typos {
let fix = extract_fix(&typo).expect("Caller only provides fixable typos"); let fix = extract_fix(&typo).expect("Caller only provides fixable typos");
@ -664,6 +656,18 @@ fn fix_buffer(mut buffer: Vec<u8>, typos: impl Iterator<Item = typos::Typo<'stat
buffer buffer
} }
fn fix_file_name<'a>(
path: &std::path::Path,
file_name: &'a str,
fixes: impl Iterator<Item = typos::Typo<'a>>,
) -> Result<std::path::PathBuf, std::io::Error> {
let file_name = file_name.to_owned().into_bytes();
let new_name = fix_buffer(file_name, fixes);
let new_name = String::from_utf8(new_name).expect("corrections are valid utf-8");
let new_path = path.with_file_name(new_name);
Ok(new_path)
}
pub fn walk_path( pub fn walk_path(
walk: ignore::Walk, walk: ignore::Walk,
checks: &dyn FileChecker, checks: &dyn FileChecker,