Skip to content

Commit caf7f6f

Browse files
roeaproeap
committed
fix: clippy
1 parent 3473330 commit caf7f6f

File tree

4 files changed

+46
-36
lines changed

4 files changed

+46
-36
lines changed

‎object-store/src/config/aws.rs‎

Lines changed: 23 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -157,30 +157,36 @@ impl S3Config {
157157

158158
fn get_value(&self, key: S3ConfigKey) -> Option<String> {
159159
match key {
160-
S3ConfigKey::AccessKeyId => self.access_key_id.clone().or(key.get_from_env()),
161-
S3ConfigKey::SecretAccessKey => self.secret_access_key.clone().or(key.get_from_env()),
160+
S3ConfigKey::AccessKeyId => self.access_key_id.clone().or_else(|| key.get_from_env()),
161+
S3ConfigKey::SecretAccessKey => self
162+
.secret_access_key
163+
.clone()
164+
.or_else(|| key.get_from_env()),
162165
S3ConfigKey::Region => self
163166
.region
164167
.clone()
165-
.or(key.get_from_env())
166-
.or(self.default_region.clone())
167-
.or(S3ConfigKey::DefaultRegion.get_from_env()),
168-
S3ConfigKey::DefaultRegion => self.default_region.clone().or(key.get_from_env()),
169-
S3ConfigKey::Bucket => self.bucket.clone().or(key.get_from_env()),
170-
S3ConfigKey::Endpoint => self.endpoint.clone().or(key.get_from_env()),
171-
S3ConfigKey::Token => self.token.clone().or(key.get_from_env()),
168+
.or_else(|| key.get_from_env())
169+
.or_else(|| self.default_region.clone())
170+
.or_else(|| S3ConfigKey::DefaultRegion.get_from_env()),
171+
S3ConfigKey::DefaultRegion => {
172+
self.default_region.clone().or_else(|| key.get_from_env())
173+
}
174+
S3ConfigKey::Bucket => self.bucket.clone().or_else(|| key.get_from_env()),
175+
S3ConfigKey::Endpoint => self.endpoint.clone().or_else(|| key.get_from_env()),
176+
S3ConfigKey::Token => self.token.clone().or_else(|| key.get_from_env()),
172177
S3ConfigKey::VirtualHostedStyleRequest => self
173178
.virtual_hosted_style_request
174-
.clone()
175179
.map(|v| v.to_string())
176-
.or(key.get_from_env()),
177-
S3ConfigKey::MetadataEndpoint => self.metadata_endpoint.clone().or(key.get_from_env()),
178-
S3ConfigKey::Profile => self.profile.clone().or(key.get_from_env()),
180+
.or_else(|| key.get_from_env()),
181+
S3ConfigKey::MetadataEndpoint => self
182+
.metadata_endpoint
183+
.clone()
184+
.or_else(|| key.get_from_env()),
185+
S3ConfigKey::Profile => self.profile.clone().or_else(|| key.get_from_env()),
179186
S3ConfigKey::AllowHttp => self
180187
.allow_http
181-
.clone()
182188
.map(|v| v.to_string())
183-
.or(key.get_from_env()),
189+
.or_else(|| key.get_from_env()),
184190
}
185191
}
186192

@@ -197,12 +203,12 @@ impl S3Config {
197203
.with_region(
198204
config
199205
.get_value(S3ConfigKey::Region)
200-
.ok_or(ConfigError::required("aws region must be specified."))?,
206+
.ok_or_else(|| ConfigError::required("aws region must be specified."))?,
201207
)
202208
.with_bucket_name(
203209
config
204210
.get_value(S3ConfigKey::Bucket)
205-
.ok_or(ConfigError::required("aws bucket must be specified."))?,
211+
.ok_or_else(|| ConfigError::required("aws bucket must be specified."))?,
206212
);
207213

208214
if let Some(endpoint) = config.get_value(S3ConfigKey::Endpoint) {

‎object-store/src/config/azure.rs‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -122,22 +122,22 @@ impl AzureConfig {
122122

123123
fn get_value(&self, key: AzureConfigKey) -> Option<String> {
124124
match key {
125-
AzureConfigKey::AccountKey => self.account_key.clone().or(key.get_from_env()),
126-
AzureConfigKey::AccountName => self.account_name.clone().or(key.get_from_env()),
127-
AzureConfigKey::ClientId => self.client_id.clone().or(key.get_from_env()),
128-
AzureConfigKey::ClientSecret => self.client_secret.clone().or(key.get_from_env()),
129-
AzureConfigKey::AuthorityId => self.authority_id.clone().or(key.get_from_env()),
130-
AzureConfigKey::SasKey => self.sas_key.clone().or(key.get_from_env()),
125+
AzureConfigKey::AccountKey => self.account_key.clone().or_else(|| key.get_from_env()),
126+
AzureConfigKey::AccountName => self.account_name.clone().or_else(|| key.get_from_env()),
127+
AzureConfigKey::ClientId => self.client_id.clone().or_else(|| key.get_from_env()),
128+
AzureConfigKey::ClientSecret => {
129+
self.client_secret.clone().or_else(|| key.get_from_env())
130+
}
131+
AzureConfigKey::AuthorityId => self.authority_id.clone().or_else(|| key.get_from_env()),
132+
AzureConfigKey::SasKey => self.sas_key.clone().or_else(|| key.get_from_env()),
131133
AzureConfigKey::UseEmulator => self
132134
.use_emulator
133-
.clone()
134135
.map(|v| v.to_string())
135-
.or(key.get_from_env()),
136+
.or_else(|| key.get_from_env()),
136137
AzureConfigKey::AllowHttp => self
137138
.allow_http
138-
.clone()
139139
.map(|v| v.to_string())
140-
.or(key.get_from_env()),
140+
.or_else(|| key.get_from_env()),
141141
}
142142
}
143143

@@ -152,9 +152,7 @@ impl AzureConfig {
152152
let mut builder = MicrosoftAzureBuilder::default().with_url(url).with_account(
153153
config
154154
.get_value(AzureConfigKey::AccountName)
155-
.ok_or(ConfigError::required(
156-
"azure storage account must be specified.",
157-
))?,
155+
.ok_or_else(|| ConfigError::required("azure storage account must be specified."))?,
158156
);
159157

160158
if let Some(use_emulator) = config.use_emulator {
@@ -166,7 +164,7 @@ impl AzureConfig {
166164
let allow_http = config.allow_http.map(Some).unwrap_or_else(|| {
167165
AzureConfigKey::AllowHttp
168166
.get_from_env()
169-
.and_then(|val| Some(str_is_truthy(&val)))
167+
.map(|val| str_is_truthy(&val))
170168
});
171169
if let Some(allow) = allow_http {
172170
builder = builder.with_allow_http(allow);

‎object-store/src/config/google.rs‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,9 @@ impl GoogleConfig {
5353

5454
fn get_value(&self, key: GoogleConfigKey) -> Option<String> {
5555
match key {
56-
GoogleConfigKey::ServiceAccount => self.service_account.clone().or(key.get_from_env()),
56+
GoogleConfigKey::ServiceAccount => {
57+
self.service_account.clone().or_else(|| key.get_from_env())
58+
}
5759
}
5860
}
5961

@@ -66,9 +68,13 @@ impl GoogleConfig {
6668
let config = Self::new(options);
6769
let builder = GoogleCloudStorageBuilder::default()
6870
.with_url(url)
69-
.with_service_account_path(config.get_value(GoogleConfigKey::ServiceAccount).ok_or(
70-
ConfigError::required("google service account must be specified."),
71-
)?);
71+
.with_service_account_path(
72+
config
73+
.get_value(GoogleConfigKey::ServiceAccount)
74+
.ok_or_else(|| {
75+
ConfigError::required("google service account must be specified.")
76+
})?,
77+
);
7278

7379
Ok(builder)
7480
}

‎object-store/src/file.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -366,7 +366,7 @@ impl ObjectInputFile {
366366
}
367367
// reference is end of the stream; offset is usually negative
368368
2 => {
369-
self.pos = self.content_length as i64 - offset;
369+
self.pos = self.content_length - offset;
370370
}
371371
_ => {
372372
return Err(PyValueError::new_err(

0 commit comments

Comments
 (0)