Skip to content

fix(config): Only try default paths if the path is not specified #18681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jszwedko merged 1 commit into from
Sep 27, 2023
Merged

fix(config): Only try default paths if the path is not specified #18681

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions src/config/loading/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,15 @@ pub fn merge_path_lists(
/// Expand a list of paths (potentially containing glob patterns) into real
/// config paths, replacing it with the default paths when empty.
pub fn process_paths(config_paths: &[ConfigPath]) -> Option<Vec<ConfigPath>> {
let default_paths = default_config_paths();

let starting_paths = if !config_paths.is_empty() {
config_paths
config_paths.to_owned()
} else {
&default_paths
default_config_paths()
};

let mut paths = Vec::new();

for config_path in starting_paths {
for config_path in &starting_paths {
let config_pattern: &PathBuf = config_path.into();

let matches: Vec<PathBuf> = match glob(config_pattern.to_str().expect("No ability to glob"))
Expand Down