nerdypepper/statix
1
1
Fork 0
mirror of https://github.com/nerdypepper/statix.git synced 2024-10-05 17:58:08 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #54 from ilkecan/accept-all-config-file-names

Browse Source 
Don't reject the given config file based on its name
This commit is contained in:
Akshay 2022-09-24 08:30:40 +05:30 committed by GitHub
commit 6b490d712e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/src/config.rs
View File

@ -55,7 +55,7 @@ pub struct Check {
#[clap(short = 'o', long, default_value_t, parse(try_from_str))]
pub format: OutFormat,
/// Path to statix.toml
/// Path to statix.toml or its parent directory
#[clap(short = 'c', long = "config", default_value = ".")]
pub conf_path: PathBuf,
@ -102,7 +102,7 @@ pub struct Fix {
#[clap(short, long = "dry-run")]
pub diff_only: bool,
/// Path to statix.toml
/// Path to statix.toml or its parent directory
#[clap(short = 'c', long = "config", default_value = ".")]
pub conf_path: PathBuf,
@ -167,7 +167,7 @@ pub struct Single {
#[clap(short, long = "stdin")]
pub streaming: bool,
/// Path to statix.toml
/// Path to statix.toml or its parent directory
#[clap(short = 'c', long = "config", default_value = ".")]
pub conf_path: PathBuf,
}
@ -286,7 +286,7 @@ impl ConfFile {
pub fn from_path<P: AsRef<Path>>(path: P) -> Result<Self, ConfigErr> {
let path = path.as_ref();
let config_file = fs::read_to_string(path).map_err(ConfigErr::InvalidPath)?;
(toml::de::from_str(&config_file)).map_err(ConfigErr::ConfFileParse)
toml::de::from_str(&config_file).map_err(ConfigErr::ConfFileParse)
}
pub fn discover<P: AsRef<Path>>(path: P) -> Result<Self, ConfigErr> {
let cannonical_path = fs::canonicalize(path.as_ref()).map_err(ConfigErr::InvalidPath)?;
@ -294,7 +294,7 @@ impl ConfFile {
let statix_toml_path = if p.is_dir() {
p.join("statix.toml")
} else {
p.with_file_name("statix.toml")
p.to_path_buf()
};
if statix_toml_path.exists() {
return Self::from_path(statix_toml_path);