Skip to content

1.52 clippy fixes #267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alamb merged 1 commit into from
May 7, 2021
Merged

1.52 clippy fixes #267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions arrow/src/array/data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -500,6 +500,7 @@ impl ArrayDataBuilder {
}

#[inline]
#[allow(clippy::len_without_is_empty)]
pub const fn len(mut self, n: usize) -> Self {
self.len = n;
self
Expand Down
6 changes: 2 additions & 4 deletions arrow/src/compute/kernels/regexp.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,8 @@ pub fn regexp_match<OffsetSize: StringOffsetSizeTrait>(
};
match re.captures(value) {
Some(caps) => {
for m in caps.iter().skip(1) {
if let Some(v) = m {
list_builder.values().append_value(v.as_str())?;
}
for m in caps.iter().skip(1).flatten() {
list_builder.values().append_value(m.as_str())?;
}
list_builder.append(true)?
}
Expand Down
2 changes: 1 addition & 1 deletion arrow/src/json/reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -654,7 +654,7 @@ impl Decoder {
projection
.iter()
.map(|name| self.schema.column_with_name(name))
.filter_map(|c| c)
.flatten()
.map(|(_, field)| field.clone())
.collect()
};
Expand Down
8 changes: 3 additions & 5 deletions parquet/src/arrow/array_reader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1405,11 +1405,9 @@ impl<'a> ArrayReaderBuilder {
self.file_reader.clone(),
)?);

let arrow_type: Option<ArrowType> = match self.get_arrow_field(&cur_type, context)
{
Some(f) => Some(f.data_type().clone()),
_ => None,
};
let arrow_type: Option<ArrowType> = self
.get_arrow_field(&cur_type, context)
.map(|f| f.data_type().clone());

match cur_type.get_physical_type() {
PhysicalType::BOOLEAN => Ok(Box::new(PrimitiveArrayReader::<BoolType>::new(
Expand Down
6 changes: 2 additions & 4 deletions parquet/src/arrow/schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ where
FieldType::Arrow(f) => Ok(Some(f)),
})
.collect::<Result<Vec<Option<Field>>>>()
.map(|result| result.into_iter().filter_map(|f| f).collect::<Vec<Field>>())
.map(|result| result.into_iter().flatten().collect::<Vec<Field>>())
.map(|fields| Schema::new_with_metadata(fields, metadata))
}

Expand Down Expand Up @@ -827,9 +827,7 @@ impl ParquetTypeConverter<'_> {
.iter()
.map(|field_ptr| self.clone_with_schema(field_ptr).to_field())
.collect::<Result<Vec<Option<Field>>>>()
.map(|result| {
result.into_iter().filter_map(|f| f).collect::<Vec<Field>>()
})
.map(|result| result.into_iter().flatten().collect::<Vec<Field>>())
.map(|fields| {
if fields.is_empty() {
None
Expand Down
8 changes: 4 additions & 4 deletions parquet/src/schema/parser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -372,15 +372,15 @@ impl<'a> Parser<'a> {
)?;
assert_token(self.tokenizer.next(), ")")?;
logical = Some(LogicalType::DECIMAL(DecimalType {
precision,
scale,
precision,
}));
converted = ConvertedType::from(logical.clone());
} else {
scale = 0;
logical = Some(LogicalType::DECIMAL(DecimalType {
precision,
scale,
precision,
}));
converted = ConvertedType::from(logical.clone());
}
Expand All @@ -401,8 +401,8 @@ impl<'a> Parser<'a> {
)?;
assert_token(self.tokenizer.next(), ")")?;
logical = Some(LogicalType::TIME(TimeType {
unit,
is_adjusted_to_u_t_c,
unit,
}));
converted = ConvertedType::from(logical.clone());
} else {
Expand All @@ -426,8 +426,8 @@ impl<'a> Parser<'a> {
)?;
assert_token(self.tokenizer.next(), ")")?;
logical = Some(LogicalType::TIMESTAMP(TimestampType {
unit,
is_adjusted_to_u_t_c,
unit,
}));
converted = ConvertedType::from(logical.clone());
} else {
Expand Down