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

feat(config): Allow separating config from source

Browse source
This commit is contained in:
Ed Page 2020-10-30 08:33:43 -05:00
parent 736db10708
commit f0c24b0afa
2 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
docs/reference.md
View file

@ -8,7 +8,7 @@ Configuration is read from the following (in precedence order)
- Command line arguments
- File specified via `--config PATH`
- Search parents of specified file / directory for `typos.toml`
- Search parents of specified file / directory for one of `typos.toml`, `_typos.toml`, or `.typos.toml`
### Config Fields

21
src/config.rs
View file

@ -131,7 +131,7 @@ impl Config {
}
pub fn derive(cwd: &std::path::Path) -> Result<Self, anyhow::Error> {
if let Some(path) = find_project_file(cwd.to_owned(), "typos.toml") {
if let Some(path) = find_project_file(cwd, &["typos.toml", "_typos.toml", ".typos.toml"]) {
Self::from_file(&path)
} else {
Ok(Default::default())
@ -435,18 +435,17 @@ impl FileSource for FileConfig {
}
}
fn find_project_file(dir: std::path::PathBuf, name: &str) -> Option<std::path::PathBuf> {
let mut file_path = dir;
file_path.push(name);
while !file_path.exists() {
file_path.pop(); // filename
let hit_bottom = !file_path.pop();
if hit_bottom {
return None;
fn find_project_file(dir: &std::path::Path, names: &[&str]) -> Option<std::path::PathBuf> {
for ancestor in dir.ancestors() {
let mut file_path = ancestor.join("placeholder");
for name in names {
file_path.set_file_name(name);
if file_path.exists() {
return Some(file_path);
}
}
file_path.push(name);
}
Some(file_path)
None
}
#[derive(Debug, Copy, Clone, serde::Serialize, serde::Deserialize)]