Skip to content

ARROW-9980: [Rust] [Parquet] Fix clippy lints #8173

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

Closed
nevi-me wants to merge 4 commits into from
Closed

ARROW-9980: [Rust] [Parquet] Fix clippy lints #8173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a80693c
arrow clippy fixes
nevi-me Sep 11, 2020
0d50898
fix variable in examples
nevi-me Sep 11, 2020
0986881
parquet clippy lints
nevi-me Sep 11, 2020
9da75b5
fix tests, more lint fixes
nevi-me Sep 12, 2020
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
2 changes: 1 addition & 1 deletion rust/arrow/benches/buffer_bit_ops.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ where

result_chunks
.into_remainder()
.into_iter()
.iter_mut()
.zip(
left_chunks
.remainder()
Expand Down
4 changes: 2 additions & 2 deletions rust/arrow/benches/cast_kernels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ use arrow::compute::cast;
use arrow::datatypes::*;

// cast array from specified primitive array type to desired data type
fn cast_array<FROM>(size: usize, to_type: DataType) -> ()
fn cast_array<FROM>(size: usize, to_type: DataType)
where
FROM: ArrowNumericType,
Standard: Distribution<FROM::Native>,
Expand All @@ -44,7 +44,7 @@ where
}

// cast timestamp array from specified primitive array type to desired data type
fn cast_timestamp_array<FROM>(size: usize, to_type: DataType) -> ()
fn cast_timestamp_array<FROM>(size: usize, to_type: DataType)
where
FROM: ArrowTimestampType,
Standard: Distribution<i64>,
Expand Down
2 changes: 1 addition & 1 deletion rust/arrow/benches/csv_writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ fn criterion_benchmark(c: &mut Criterion) {
c.bench(
"record_batches_to_csv",
Benchmark::new("record_batches_to_csv", move |b| {
b.iter(|| record_batches_to_csv())
b.iter(record_batches_to_csv)
}),
);
}
Expand Down
2 changes: 1 addition & 1 deletion rust/arrow/benches/length_kernel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ fn bench_length() {
}

fn add_benchmark(c: &mut Criterion) {
c.bench_function("length", |b| b.iter(|| bench_length()));
c.bench_function("length", |b| b.iter(bench_length));
}

criterion_group!(benches, add_benchmark);
Expand Down
4 changes: 2 additions & 2 deletions rust/arrow/benches/take_kernels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ fn create_random_index(size: usize) -> UInt32Array {
)
}

fn take_numeric<T>(size: usize, index_len: usize) -> ()
fn take_numeric<T>(size: usize, index_len: usize)
where
T: ArrowNumericType,
Standard: Distribution<T::Native>,
Expand All @@ -63,7 +63,7 @@ where
criterion::black_box(take(&array, &index, None).unwrap());
}

fn take_boolean(size: usize, index_len: usize) -> () {
fn take_boolean(size: usize, index_len: usize) {
let array = Arc::new(BooleanArray::from(vec![random::<bool>(); size])) as ArrayRef;
let index = create_random_index(index_len);
criterion::black_box(take(&array, &index, None).unwrap());
Expand Down
6 changes: 3 additions & 3 deletions rust/arrow/examples/builders.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ fn main() {

// Construct a list array from the above two
let list_data_type = DataType::List(Box::new(DataType::Int32));
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.len(3)
.add_buffer(value_offsets.clone())
.add_child_data(value_data.clone())
.add_buffer(value_offsets)
.add_child_data(value_data)
.build();
let list_array = ListArray::from(list_data);

Expand Down
2 changes: 1 addition & 1 deletion rust/arrow/examples/read_csv.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ fn main() -> Result<()> {
let _batch = csv.next().unwrap().unwrap();
#[cfg(feature = "prettyprint")]
{
print_batches(&vec![_batch]).unwrap();
print_batches(&[_batch]).unwrap();
}
Ok(())
}
2 changes: 1 addition & 1 deletion rust/arrow/examples/read_csv_infer_schema.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ fn main() -> Result<()> {
let _batch = csv.next().unwrap().unwrap();
#[cfg(feature = "prettyprint")]
{
print_batches(&vec![_batch]).unwrap();
print_batches(&[_batch]).unwrap();
}
Ok(())
}
24 changes: 12 additions & 12 deletions rust/arrow/src/array/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3212,9 +3212,9 @@ mod tests {

// Construct a list array from the above two
let list_data_type = DataType::FixedSizeList(Box::new(DataType::Int32), 3);
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.len(3)
.add_child_data(value_data.clone())
.add_child_data(value_data)
.build();
FixedSizeListArray::from(list_data);
}
Expand Down Expand Up @@ -3243,9 +3243,9 @@ mod tests {

// Construct a list array from the above two
let list_data_type = DataType::List(Box::new(DataType::Int32));
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.len(9)
.add_buffer(value_offsets.clone())
.add_buffer(value_offsets)
.add_child_data(value_data.clone())
.null_bit_buffer(Buffer::from(null_bits))
.build();
Expand Down Expand Up @@ -3307,9 +3307,9 @@ mod tests {

// Construct a list array from the above two
let list_data_type = DataType::LargeList(Box::new(DataType::Int32));
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.len(9)
.add_buffer(value_offsets.clone())
.add_buffer(value_offsets)
.add_child_data(value_data.clone())
.null_bit_buffer(Buffer::from(null_bits))
.build();
Expand Down Expand Up @@ -3369,7 +3369,7 @@ mod tests {

// Construct a fixed size list array from the above two
let list_data_type = DataType::FixedSizeList(Box::new(DataType::Int32), 2);
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.len(5)
.add_child_data(value_data.clone())
.null_bit_buffer(Buffer::from(null_bits))
Expand Down Expand Up @@ -3449,10 +3449,10 @@ mod tests {
let value_offsets = Buffer::from(&[2, 2, 5, 7].to_byte_slice());

let list_data_type = DataType::List(Box::new(DataType::Int32));
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.len(3)
.add_buffer(value_offsets.clone())
.add_child_data(value_data.clone())
.add_buffer(value_offsets)
.add_child_data(value_data)
.build();
ListArray::from(list_data);
}
Expand Down Expand Up @@ -4077,9 +4077,9 @@ mod tests {
.build();

let list_data_type = DataType::List(Box::new(DataType::Int32));
let list_data = ArrayData::builder(list_data_type.clone())
let list_data = ArrayData::builder(list_data_type)
.add_buffer(buf2)
.add_child_data(value_data.clone())
.add_child_data(value_data)
.build();
ListArray::from(list_data);
}
Expand Down
22 changes: 7 additions & 15 deletions rust/arrow/src/array/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2531,8 +2531,8 @@ mod tests {
#[test]
fn test_append_slice() {
let mut b = UInt8BufferBuilder::new(0);
b.append_slice("Hello, ".as_bytes()).unwrap();
b.append_slice("World!".as_bytes()).unwrap();
b.append_slice(b"Hello, ").unwrap();
b.append_slice(b"World!").unwrap();
let buffer = b.finish();
assert_eq!(13, buffer.len());

Expand Down Expand Up @@ -3099,9 +3099,7 @@ mod tests {
builder.append_byte(b'd').unwrap();
builder.append(true).unwrap();

let array = builder.finish();

let binary_array = BinaryArray::from(array);
let binary_array = builder.finish();

assert_eq!(3, binary_array.len());
assert_eq!(0, binary_array.null_count());
Expand Down Expand Up @@ -3130,9 +3128,7 @@ mod tests {
builder.append_byte(b'd').unwrap();
builder.append(true).unwrap();

let array = builder.finish();

let binary_array = LargeBinaryArray::from(array);
let binary_array = builder.finish();

assert_eq!(3, binary_array.len());
assert_eq!(0, binary_array.null_count());
Expand All @@ -3151,9 +3147,7 @@ mod tests {
builder.append(true).unwrap();
builder.append_value("world").unwrap();

let array = builder.finish();

let string_array = StringArray::from(array);
let string_array = builder.finish();

assert_eq!(3, string_array.len());
assert_eq!(0, string_array.null_count());
Expand Down Expand Up @@ -3210,9 +3204,7 @@ mod tests {
builder.append(true).unwrap();
builder.append_value("world").unwrap();

let array = builder.finish();

let string_array = StringArray::from(array);
let string_array = builder.finish();

assert_eq!(3, string_array.len());
assert_eq!(0, string_array.null_count());
Expand Down Expand Up @@ -3274,7 +3266,7 @@ mod tests {
.null_count(2)
.null_bit_buffer(Buffer::from(&[9_u8]))
.add_buffer(Buffer::from(&[0, 3, 3, 3, 7].to_byte_slice()))
.add_buffer(Buffer::from("joemark".as_bytes()))
.add_buffer(Buffer::from(b"joemark"))
.build();

let expected_int_data = ArrayData::builder(DataType::Int32)
Expand Down
20 changes: 10 additions & 10 deletions rust/arrow/src/array/union.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ mod tests {
// Check type ids
assert_eq!(
union.data().buffers()[0],
Buffer::from(&expected_type_ids.clone().to_byte_slice())
Buffer::from(&expected_type_ids.to_byte_slice())
);
for (i, id) in expected_type_ids.iter().enumerate() {
assert_eq!(id, &union.type_id(i));
Expand All @@ -666,7 +666,7 @@ mod tests {
// Check offsets
assert_eq!(
union.data().buffers()[1],
Buffer::from(expected_value_offsets.clone().to_byte_slice())
Buffer::from(expected_value_offsets.to_byte_slice())
);
for (i, id) in expected_value_offsets.iter().enumerate() {
assert_eq!(&union.value_offset(i), id);
Expand Down Expand Up @@ -951,7 +951,7 @@ mod tests {
.downcast_ref::<Float64Array>()
.unwrap()
.value(0);
assert_eq!(10.0, value);
assert!(10.0 - value < f64::EPSILON);

let slot = array.value(4);
let value = slot
Expand Down Expand Up @@ -983,7 +983,7 @@ mod tests {

// Check type ids
assert_eq!(
Buffer::from(&expected_type_ids.clone().to_byte_slice()),
Buffer::from(&expected_type_ids.to_byte_slice()),
union.data().buffers()[0]
);
for (i, id) in expected_type_ids.iter().enumerate() {
Expand Down Expand Up @@ -1034,7 +1034,7 @@ mod tests {

// Check type ids
assert_eq!(
Buffer::from(&expected_type_ids.clone().to_byte_slice()),
Buffer::from(&expected_type_ids.to_byte_slice()),
union.data().buffers()[0]
);
for (i, id) in expected_type_ids.iter().enumerate() {
Expand Down Expand Up @@ -1064,7 +1064,7 @@ mod tests {
let slot = slot.as_any().downcast_ref::<Float64Array>().unwrap();
assert_eq!(slot.len(), 1);
let value = slot.value(0);
assert_eq!(value, 3_f64);
assert!(value - 3_f64 < f64::EPSILON);
}
3 => {
let slot = slot.as_any().downcast_ref::<Int32Array>().unwrap();
Expand All @@ -1076,7 +1076,7 @@ mod tests {
let slot = slot.as_any().downcast_ref::<Float64Array>().unwrap();
assert_eq!(slot.len(), 1);
let value = slot.value(0);
assert_eq!(5_f64, value);
assert!(5_f64 - value < f64::EPSILON);
}
5 => {
let slot = slot.as_any().downcast_ref::<Int32Array>().unwrap();
Expand Down Expand Up @@ -1109,7 +1109,7 @@ mod tests {

// Check type ids
assert_eq!(
Buffer::from(&expected_type_ids.clone().to_byte_slice()),
Buffer::from(&expected_type_ids.to_byte_slice()),
union.data().buffers()[0]
);
for (i, id) in expected_type_ids.iter().enumerate() {
Expand Down Expand Up @@ -1142,7 +1142,7 @@ mod tests {
assert_eq!(false, union.is_null(i));
assert_eq!(slot.len(), 1);
let value = slot.value(0);
assert_eq!(value, 3_f64);
assert!(value - 3_f64 < f64::EPSILON);
}
4 => {
let slot = slot.as_any().downcast_ref::<Int32Array>().unwrap();
Expand Down Expand Up @@ -1187,7 +1187,7 @@ mod tests {
assert_eq!(false, new_union.is_null(i));
assert_eq!(slot.len(), 1);
let value = slot.value(0);
assert_eq!(value, 3_f64);
assert!(value - 3_f64 < f64::EPSILON);
}
3 => assert!(new_union.is_null(i)),
4 => {
Expand Down
Loading