Skip to content

Commit 8e669e7

Browse files
authored
Fix linting issues missed by #8506 (#8581)
1 parent 209eafa commit 8e669e7

File tree

5 files changed

+23
-23
lines changed

5 files changed

+23
-23
lines changed

parquet/src/arrow/arrow_writer/byte_array.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ use crate::encodings::encoding::{DeltaBitPackEncoder, Encoder};
2323
use crate::encodings::rle::RleEncoder;
2424
use crate::errors::{ParquetError, Result};
2525
use crate::file::properties::{EnabledStatistics, WriterProperties, WriterVersion};
26-
use crate::geospatial::accumulator::{try_new_geo_stats_accumulator, GeoStatsAccumulator};
26+
use crate::geospatial::accumulator::{GeoStatsAccumulator, try_new_geo_stats_accumulator};
2727
use crate::geospatial::statistics::GeospatialStatistics;
2828
use crate::schema::types::ColumnDescPtr;
2929
use crate::util::bit_util::num_required_bits;

parquet/src/arrow/arrow_writer/mod.rs

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4161,13 +4161,12 @@ mod tests {
41614161
true,
41624162
)]));
41634163
let parquet_schema = Type::group_type_builder("root")
4164-
.with_fields(vec![Type::primitive_type_builder(
4165-
"integers",
4166-
crate::basic::Type::INT64,
4167-
)
4168-
.build()
4169-
.unwrap()
4170-
.into()])
4164+
.with_fields(vec![
4165+
Type::primitive_type_builder("integers", crate::basic::Type::INT64)
4166+
.build()
4167+
.unwrap()
4168+
.into(),
4169+
])
41714170
.build()
41724171
.unwrap();
41734172
let parquet_schema_descr = SchemaDescriptor::new(parquet_schema.into());

parquet/src/column/writer/encoder.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ use crate::data_type::private::ParquetValueType;
2828
use crate::encodings::encoding::{DictEncoder, Encoder, get_encoder};
2929
use crate::errors::{ParquetError, Result};
3030
use crate::file::properties::{EnabledStatistics, WriterProperties};
31-
use crate::geospatial::accumulator::{try_new_geo_stats_accumulator, GeoStatsAccumulator};
31+
use crate::geospatial::accumulator::{GeoStatsAccumulator, try_new_geo_stats_accumulator};
3232
use crate::geospatial::statistics::GeospatialStatistics;
3333
use crate::schema::types::{ColumnDescPtr, ColumnDescriptor};
3434

parquet/src/geospatial/accumulator.rs

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -294,10 +294,12 @@ mod test {
294294

295295
// We should not be able to initialize a global accumulator after we've initialized at least
296296
// one accumulator
297-
assert!(init_geo_stats_accumulator_factory(Arc::new(
298-
DefaultGeoStatsAccumulatorFactory::default()
299-
))
300-
.is_err())
297+
assert!(
298+
init_geo_stats_accumulator_factory(Arc::new(
299+
DefaultGeoStatsAccumulatorFactory::default()
300+
))
301+
.is_err()
302+
)
301303
}
302304

303305
#[cfg(feature = "geospatial")]

parquet/tests/geospatial.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -132,11 +132,11 @@ mod test {
132132

133133
use std::{iter::zip, sync::Arc};
134134

135-
use arrow_array::{create_array, ArrayRef, BinaryArray, RecordBatch};
135+
use arrow_array::{ArrayRef, BinaryArray, RecordBatch, create_array};
136136
use arrow_schema::{DataType, Field, Schema};
137137
use bytes::Bytes;
138138
use parquet::{
139-
arrow::{arrow_writer::ArrowWriterOptions, ArrowWriter},
139+
arrow::{ArrowWriter, arrow_writer::ArrowWriterOptions},
140140
column::reader::ColumnReader,
141141
data_type::{ByteArray, ByteArrayType},
142142
file::{
@@ -415,14 +415,13 @@ mod test {
415415

416416
fn parquet_schema_geometry() -> Type {
417417
Type::group_type_builder("root")
418-
.with_fields(vec![Type::primitive_type_builder(
419-
"geo",
420-
parquet::basic::Type::BYTE_ARRAY,
421-
)
422-
.with_logical_type(Some(LogicalType::Geometry { crs: None }))
423-
.build()
424-
.unwrap()
425-
.into()])
418+
.with_fields(vec![
419+
Type::primitive_type_builder("geo", parquet::basic::Type::BYTE_ARRAY)
420+
.with_logical_type(Some(LogicalType::Geometry { crs: None }))
421+
.build()
422+
.unwrap()
423+
.into(),
424+
])
426425
.build()
427426
.unwrap()
428427
}

0 commit comments

Comments
 (0)