@@ -1068,7 +1068,7 @@ impl Config {
1068
1068
let home = self . home_path . clone ( ) . into_path_unlocked ( ) ;
1069
1069
1070
1070
self . walk_tree ( path, & home, |path| {
1071
- let value = self . load_file ( path, true ) ?;
1071
+ let value = self . load_file ( path) ?;
1072
1072
cfg. merge ( value, false ) . with_context ( || {
1073
1073
format ! ( "failed to merge configuration at `{}`" , path. display( ) )
1074
1074
} ) ?;
@@ -1085,8 +1085,8 @@ impl Config {
1085
1085
/// Loads a config value from a path.
1086
1086
///
1087
1087
/// This is used during config file discovery.
1088
- fn load_file ( & self , path : & Path , includes : bool ) -> CargoResult < ConfigValue > {
1089
- self . _load_file ( path, & mut HashSet :: new ( ) , includes , WhyLoad :: FileDiscovery )
1088
+ fn load_file ( & self , path : & Path ) -> CargoResult < ConfigValue > {
1089
+ self . _load_file ( path, & mut HashSet :: new ( ) , true , WhyLoad :: FileDiscovery )
1090
1090
}
1091
1091
1092
1092
/// Loads a config value from a path with options.
@@ -1476,7 +1476,7 @@ impl Config {
1476
1476
None => return Ok ( ( ) ) ,
1477
1477
} ;
1478
1478
1479
- let mut value = self . load_file ( & credentials, true ) ?;
1479
+ let mut value = self . load_file ( & credentials) ?;
1480
1480
// Backwards compatibility for old `.cargo/credentials` layout.
1481
1481
{
1482
1482
let ( value_map, def) = match value {
0 commit comments