Skip to content

Commit d525141

Browse files
committed
Apply clippy fixes and rustfmt
1 parent e0d3bef commit d525141

File tree

3 files changed

+11
-24
lines changed

3 files changed

+11
-24
lines changed

src/codes_handle/mod.rs

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -274,9 +274,7 @@ mod tests {
274274
let codes_file = CodesFile::new_from_file(file_path, product_kind)?;
275275

276276
assert!(!codes_file.pointer.is_null());
277-
assert_eq!(codes_file.product_kind as u32, {
278-
ProductKind_PRODUCT_GRIB
279-
});
277+
assert_eq!(codes_file.product_kind as u32, { ProductKind_PRODUCT_GRIB });
280278

281279
codes_file._data.metadata()?;
282280

@@ -293,9 +291,7 @@ mod tests {
293291

294292
let codes_file = CodesFile::new_from_memory(buf, product_kind)?;
295293
assert!(!codes_file.pointer.is_null());
296-
assert_eq!(codes_file.product_kind as u32, {
297-
ProductKind_PRODUCT_GRIB
298-
});
294+
assert_eq!(codes_file.product_kind as u32, { ProductKind_PRODUCT_GRIB });
299295

300296
assert!(!codes_file._data.is_empty());
301297

src/codes_message/mod.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
//! used for reading and writing data of given variable from GRIB file
33
44
mod clone;
5-
mod read;
6-
mod write;
75
#[cfg(feature = "ndarray")]
86
#[cfg_attr(docsrs, doc(cfg(feature = "ndarray")))]
97
mod ndarray;
8+
mod read;
9+
mod write;
1010

1111
#[cfg_attr(docsrs, doc(cfg(feature = "ndarray")))]
1212
pub use ndarray::RustyCodesMessage;

src/codes_message/read.rs

Lines changed: 7 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -229,38 +229,29 @@ impl<P: Debug> CodesMessage<P> {
229229
match key_type {
230230
NativeKeyType::Long => {
231231
if key_size == 1 {
232-
self.read_key_unchecked(key_name)
233-
.map(|v| DynamicKeyType::Int(v))
232+
self.read_key_unchecked(key_name).map(DynamicKeyType::Int)
234233
} else if key_size >= 2 {
235234
self.read_key_unchecked(key_name)
236-
.map(|v| DynamicKeyType::IntArray(v))
235+
.map(DynamicKeyType::IntArray)
237236
} else {
238237
return Err(CodesError::IncorrectKeySize);
239238
}
240239
}
241240
NativeKeyType::Double => {
242241
if key_size == 1 {
243-
self.read_key_unchecked(key_name)
244-
.map(|v| DynamicKeyType::Float(v))
242+
self.read_key_unchecked(key_name).map(DynamicKeyType::Float)
245243
} else if key_size >= 2 {
246244
self.read_key_unchecked(key_name)
247-
.map(|v| DynamicKeyType::FloatArray(v))
245+
.map(DynamicKeyType::FloatArray)
248246
} else {
249247
return Err(CodesError::IncorrectKeySize);
250248
}
251249
}
252-
NativeKeyType::Bytes => self
253-
.read_key_unchecked(key_name)
254-
.map(|v| DynamicKeyType::Bytes(v)),
250+
NativeKeyType::Bytes => self.read_key_unchecked(key_name).map(DynamicKeyType::Bytes),
255251
NativeKeyType::Missing => return Err(CodesError::MissingKey),
256-
_ => self
257-
.read_key_unchecked(key_name)
258-
.map(|v| DynamicKeyType::Str(v)),
252+
_ => self.read_key_unchecked(key_name).map(DynamicKeyType::Str),
259253
}
260-
.or_else(|_| {
261-
self.read_key_unchecked(key_name)
262-
.map(|v| DynamicKeyType::Bytes(v))
263-
})
254+
.or_else(|_| self.read_key_unchecked(key_name).map(DynamicKeyType::Bytes))
264255
}
265256
}
266257

0 commit comments

Comments
 (0)