@@ -117,19 +117,14 @@ fn load_client_config_inner(
117117 ruby : & Ruby ,
118118 config_source : Option < DataSource > ,
119119 config_file_strict : bool ,
120- disable_file : bool ,
121120 env_vars : Option < HashMap < String , String > > ,
122121) -> Result < RHash , Error > {
123- let core_config = if disable_file {
124- CoreClientConfig :: default ( )
125- } else {
126- let options = LoadClientConfigOptions {
127- config_source,
128- config_file_strict,
129- } ;
130- core_load_client_config ( options, env_vars. as_ref ( ) )
131- . map_err ( |e| error ! ( "EnvConfig error: {}" , e) ) ?
122+ let options = LoadClientConfigOptions {
123+ config_source,
124+ config_file_strict,
132125 } ;
126+ let core_config = core_load_client_config ( options, env_vars. as_ref ( ) )
127+ . map_err ( |e| error ! ( "EnvConfig error: {}" , e) ) ?;
133128
134129 core_config_to_hash ( ruby, & core_config)
135130}
@@ -157,18 +152,18 @@ fn load_client_connect_config_inner(
157152 profile_to_hash ( ruby, & profile)
158153}
159154
160- // load_client_config(path: String|nil, data: String|nil, disable_file: bool, config_file_strict: bool, env_vars: Hash|nil)
155+ // load_client_config(path: String|nil, data: String|nil, config_file_strict: bool, env_vars: Hash|nil)
161156fn load_client_config ( args : & [ magnus:: Value ] ) -> Result < RHash , Error > {
162157 let ruby = Ruby :: get ( ) . expect ( "Not in Ruby thread" ) ;
163158 let args = scan_args:: scan_args :: <
164- ( Option < String > , Option < RString > , bool , bool ) ,
159+ ( Option < String > , Option < RString > , bool ) ,
165160 ( Option < HashMap < String , String > > , ) ,
166161 ( ) ,
167162 ( ) ,
168163 ( ) ,
169164 ( ) ,
170165 > ( args) ?;
171- let ( path, data, disable_file , config_file_strict) = args. required ;
166+ let ( path, data, config_file_strict) = args. required ;
172167 let ( env_vars, ) = args. optional ;
173168
174169 let config_source = match ( path, data) {
@@ -189,7 +184,6 @@ fn load_client_config(args: &[magnus::Value]) -> Result<RHash, Error> {
189184 & ruby,
190185 config_source,
191186 config_file_strict,
192- disable_file,
193187 env_vars,
194188 )
195189}
0 commit comments