Skip to content

Commit 0ff7867

Browse files
committed
clippy
1 parent 46506a5 commit 0ff7867

4 files changed

Lines changed: 13 additions & 14 deletions

File tree

src/lib.rs

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ impl CodecPipelineImpl {
211211
#[gen_stub_pymethods]
212212
#[pymethods]
213213
impl CodecPipelineImpl {
214+
#[allow(clippy::too_many_arguments)] // python functions can have defaults
214215
#[pyo3(signature = (
215216
array_metadata,
216217
store_config,
@@ -266,17 +267,15 @@ impl CodecPipelineImpl {
266267
DataType::from_metadata(&metadata_v3.data_type).map_py_err::<PyTypeError>()?;
267268
let fill_value = data_type
268269
.fill_value(&metadata_v3.fill_value, ZarrVersion::V3)
269-
.or_else(|_| {
270-
Err(match &metadata {
271-
ArrayMetadata::V2(metadata) => format!(
272-
"incompatible fill value metadata: dtype={}, fill_value={}",
273-
metadata.dtype, metadata.fill_value
274-
),
275-
ArrayMetadata::V3(metadata) => format!(
276-
"incompatible fill value metadata: data_type={}, fill_value={}",
277-
metadata.data_type, metadata.fill_value
278-
),
279-
})
270+
.map_err(|_| match &metadata {
271+
ArrayMetadata::V2(metadata) => format!(
272+
"incompatible fill value metadata: dtype={}, fill_value={}",
273+
metadata.dtype, metadata.fill_value
274+
),
275+
ArrayMetadata::V3(metadata) => format!(
276+
"incompatible fill value metadata: data_type={}, fill_value={}",
277+
metadata.data_type, metadata.fill_value
278+
),
280279
})
281280
.map_py_err::<PyTypeError>()?;
282281

src/store.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ impl<'py> FromPyObject<'_, 'py> for StoreConfig {
7272
}
7373

7474
impl StoreConfig {
75-
pub fn direct_io(&mut self, flag: bool) -> () {
75+
pub fn direct_io(&mut self, flag: bool) {
7676
match self {
7777
StoreConfig::Filesystem(config) => config.direct_io(flag),
7878
StoreConfig::Http(_config) => (),

src/store/filesystem.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ impl FilesystemStoreConfig {
2222
}
2323
}
2424

25-
pub fn direct_io(&mut self, flag: bool) -> () {
25+
pub fn direct_io(&mut self, flag: bool) {
2626
self.opts.direct_io(flag);
2727
}
2828
}

src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pub fn is_whole_chunk(item: &ChunkItem) -> bool {
4545
&& item.chunk_subset.shape() == bytemuck::must_cast_slice::<_, u64>(&item.shape)
4646
}
4747

48-
#[derive(Debug, Clone)]
48+
#[derive(Debug, Clone, Copy)]
4949
pub struct SubchunkWriteOrderWrapper(pub SubchunkWriteOrder);
5050

5151
impl<'py> IntoPyObject<'py> for SubchunkWriteOrderWrapper {

0 commit comments

Comments
 (0)