Skip to content

Commit 2b2ec7e

Browse files
alambalamb
authored
Fix clippy lints for Rust 1.54 (#631)
1 parent b46115b commit 2b2ec7e

18 files changed

Lines changed: 63 additions & 62 deletions

File tree

‎arrow/src/array/equal/mod.rs‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -307,11 +307,11 @@ mod tests {
307307
let a = a.data();
308308
let b = NullArray::new(12);
309309
let b = b.data();
310-
test_equal(&a, &b, true);
310+
test_equal(a, b, true);
311311

312312
let b = NullArray::new(10);
313313
let b = b.data();
314-
test_equal(&a, &b, false);
314+
test_equal(a, b, false);
315315

316316
// Test the case where offset != 0
317317

@@ -330,11 +330,11 @@ mod tests {
330330
let a = a.data();
331331
let b = BooleanArray::from(vec![false, false, true]);
332332
let b = b.data();
333-
test_equal(&a, &b, true);
333+
test_equal(a, b, true);
334334

335335
let b = BooleanArray::from(vec![false, false, false]);
336336
let b = b.data();
337-
test_equal(&a, &b, false);
337+
test_equal(a, b, false);
338338
}
339339

340340
#[test]
@@ -343,15 +343,15 @@ mod tests {
343343
let a = a.data();
344344
let b = BooleanArray::from(vec![Some(false), None, None, Some(true)]);
345345
let b = b.data();
346-
test_equal(&a, &b, true);
346+
test_equal(a, b, true);
347347

348348
let b = BooleanArray::from(vec![None, None, None, Some(true)]);
349349
let b = b.data();
350-
test_equal(&a, &b, false);
350+
test_equal(a, b, false);
351351

352352
let b = BooleanArray::from(vec![Some(true), None, None, Some(true)]);
353353
let b = b.data();
354-
test_equal(&a, &b, false);
354+
test_equal(a, b, false);
355355
}
356356

357357
#[test]
@@ -382,15 +382,15 @@ mod tests {
382382
let a = a.data();
383383
let b = BooleanArray::from(vector.clone());
384384
let b = b.data();
385-
test_equal(&a, &b, true);
385+
test_equal(a, b, true);
386386

387387
// Elements fill in `u8`s + suffix bits.
388388
vector.push(true);
389389
let a = BooleanArray::from(vector.clone());
390390
let a = a.data();
391391
let b = BooleanArray::from(vector);
392392
let b = b.data();
393-
test_equal(&a, &b, true);
393+
test_equal(a, b, true);
394394
}
395395

396396
#[test]
@@ -428,7 +428,7 @@ mod tests {
428428
let lhs = lhs.data();
429429
let rhs = Int32Array::from(rhs);
430430
let rhs = rhs.data();
431-
test_equal(&lhs, &rhs, expected);
431+
test_equal(lhs, rhs, expected);
432432
}
433433
}
434434

@@ -588,7 +588,7 @@ mod tests {
588588
let b = StringArray::from(vec![Some("b")]);
589589
let b = b.data();
590590

591-
test_equal(&a, &b, true);
591+
test_equal(&a, b, true);
592592
}
593593

594594
#[test]
@@ -609,11 +609,11 @@ mod tests {
609609
let a = a.data();
610610
let b = NullArray::new(2);
611611
let b = b.data();
612-
test_equal(&a, &b, true);
612+
test_equal(a, b, true);
613613

614614
let b = NullArray::new(1);
615615
let b = b.data();
616-
test_equal(&a, &b, false);
616+
test_equal(a, b, false);
617617
}
618618

619619
fn create_list_array<U: AsRef<[i32]>, T: AsRef<[Option<U>]>>(data: T) -> ArrayData {
@@ -1016,7 +1016,7 @@ mod tests {
10161016
let b = StructArray::try_from(vec![("f1", strings), ("f2", ints)]).unwrap();
10171017
let b = b.data();
10181018

1019-
test_equal(&a, &b, true);
1019+
test_equal(a, b, true);
10201020
}
10211021

10221022
#[test]

‎arrow/src/compute/kernels/arithmetic.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1184,7 +1184,7 @@ mod tests {
11841184
assert_eq!(5, a.value(0));
11851185
assert_eq!(6, b.value(0));
11861186

1187-
let c = add(&a, &b).unwrap();
1187+
let c = add(a, b).unwrap();
11881188
assert_eq!(5, c.len());
11891189
assert_eq!(11, c.value(0));
11901190
assert_eq!(13, c.value(1));
@@ -1281,7 +1281,7 @@ mod tests {
12811281
let a = a.as_any().downcast_ref::<Int32Array>().unwrap();
12821282
let b = b.as_any().downcast_ref::<Int32Array>().unwrap();
12831283

1284-
let c = divide(&a, &b).unwrap();
1284+
let c = divide(a, b).unwrap();
12851285
assert_eq!(5, c.len());
12861286
assert_eq!(3, c.value(0));
12871287
assert_eq!(2, c.value(1));
@@ -1299,7 +1299,7 @@ mod tests {
12991299
let a = a.as_any().downcast_ref::<Int32Array>().unwrap();
13001300
let b = b.as_any().downcast_ref::<Int32Array>().unwrap();
13011301

1302-
let c = modulus(&a, &b).unwrap();
1302+
let c = modulus(a, b).unwrap();
13031303
assert_eq!(5, c.len());
13041304
assert_eq!(0, c.value(0));
13051305
assert_eq!(3, c.value(1));
@@ -1397,7 +1397,7 @@ mod tests {
13971397
let b = b.slice(8, 6);
13981398
let b = b.as_any().downcast_ref::<Int32Array>().unwrap();
13991399

1400-
let c = divide(&a, &b).unwrap();
1400+
let c = divide(a, b).unwrap();
14011401
assert_eq!(6, c.len());
14021402
assert_eq!(3, c.value(0));
14031403
assert!(c.is_null(1));
@@ -1450,7 +1450,7 @@ mod tests {
14501450
let b = b.slice(8, 6);
14511451
let b = b.as_any().downcast_ref::<Int32Array>().unwrap();
14521452

1453-
let c = modulus(&a, &b).unwrap();
1453+
let c = modulus(a, b).unwrap();
14541454
assert_eq!(6, c.len());
14551455
assert_eq!(0, c.value(0));
14561456
assert!(c.is_null(1));
@@ -1516,7 +1516,7 @@ mod tests {
15161516
let b = b.slice(63, 65);
15171517
let b = b.as_any().downcast_ref::<UInt8Array>().unwrap();
15181518

1519-
let actual = add(&a, &b).unwrap();
1519+
let actual = add(a, b).unwrap();
15201520
let actual: Vec<Option<u8>> = actual.iter().collect();
15211521
let expected: Vec<Option<u8>> = (63..63_u8 + 65_u8)
15221522
.into_iter()

‎arrow/src/compute/kernels/boolean.rs‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ mod tests {
818818
let a = BooleanArray::from(vec![None, Some(true), Some(false), None, Some(true)]);
819819
let a = a.slice(1, 4);
820820
let a = a.as_any().downcast_ref::<BooleanArray>().unwrap();
821-
let c = not(&a).unwrap();
821+
let c = not(a).unwrap();
822822

823823
let expected =
824824
BooleanArray::from(vec![Some(false), Some(true), None, Some(false)]);
@@ -883,7 +883,7 @@ mod tests {
883883
let b = b.slice(8, 4);
884884
let b = b.as_any().downcast_ref::<BooleanArray>().unwrap();
885885

886-
let c = and(&a, &b).unwrap();
886+
let c = and(a, b).unwrap();
887887

888888
let expected = BooleanArray::from(vec![false, false, false, true]);
889889

@@ -906,7 +906,7 @@ mod tests {
906906
let b = b.slice(8, 4);
907907
let b = b.as_any().downcast_ref::<BooleanArray>().unwrap();
908908

909-
let c = and(&a, &b).unwrap();
909+
let c = and(a, b).unwrap();
910910

911911
let expected = BooleanArray::from(vec![false, false, false, true]);
912912

@@ -924,7 +924,7 @@ mod tests {
924924
let a = a.slice(8, 4);
925925
let a = a.as_any().downcast_ref::<BooleanArray>().unwrap();
926926

927-
let c = and(&a, &b).unwrap();
927+
let c = and(a, &b).unwrap();
928928

929929
let expected = BooleanArray::from(vec![false, false, false, true]);
930930

@@ -942,7 +942,7 @@ mod tests {
942942
let b = b.slice(8, 4);
943943
let b = b.as_any().downcast_ref::<BooleanArray>().unwrap();
944944

945-
let c = and(&a, &b).unwrap();
945+
let c = and(&a, b).unwrap();
946946

947947
let expected = BooleanArray::from(vec![false, false, false, true]);
948948

@@ -967,7 +967,7 @@ mod tests {
967967
let b = b.slice(2, 4);
968968
let b = b.as_any().downcast_ref::<BooleanArray>().unwrap();
969969

970-
let c = and(&a, &b).unwrap();
970+
let c = and(a, b).unwrap();
971971

972972
let expected =
973973
BooleanArray::from(vec![Some(false), Some(false), None, Some(true)]);
@@ -1147,7 +1147,7 @@ mod tests {
11471147
]);
11481148
let comp = comp.slice(2, 3); // Some(false), None, Some(true)
11491149
let comp = comp.as_any().downcast_ref::<BooleanArray>().unwrap();
1150-
let res = nullif(&a, &comp).unwrap();
1150+
let res = nullif(a, comp).unwrap();
11511151

11521152
let expected = Int32Array::from(vec![
11531153
Some(15), // False => keep it

‎arrow/src/compute/kernels/cast.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3229,7 +3229,7 @@ mod tests {
32293229
where
32303230
T: ArrowNumericType,
32313231
{
3232-
let c = cast(&array, dt).unwrap();
3232+
let c = cast(array, dt).unwrap();
32333233
let a = c.as_any().downcast_ref::<PrimitiveArray<T>>().unwrap();
32343234
let mut v: Vec<String> = vec![];
32353235
for i in 0..array.len() {
@@ -3533,7 +3533,7 @@ mod tests {
35333533
for array in get_arrays_of_all_types() {
35343534
for to_type in &all_types {
35353535
println!("Test casting {:?} --> {:?}", array.data_type(), to_type);
3536-
let cast_result = cast(&array, &to_type);
3536+
let cast_result = cast(&array, to_type);
35373537
let reported_cast_ability = can_cast_types(array.data_type(), to_type);
35383538

35393539
// check for mismatch

‎arrow/src/compute/kernels/cast_utils.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ mod tests {
209209
// Note: Use chrono APIs that are different than
210210
// naive_datetime_to_timestamp to compute the utc offset to
211211
// try and double check the logic
212-
let utc_offset_secs = match Local.offset_from_local_datetime(&naive_datetime) {
212+
let utc_offset_secs = match Local.offset_from_local_datetime(naive_datetime) {
213213
LocalResult::Single(local_offset) => {
214214
local_offset.fix().local_minus_utc() as i64
215215
}

‎arrow/src/compute/kernels/comparison.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1042,7 +1042,7 @@ mod tests {
10421042
let b = Int32Array::from(vec![1, 2, 3, 4, 5, 6, 7, 8, 9, 10]);
10431043
let b_slice = b.slice(5, 5);
10441044
let c = b_slice.as_any().downcast_ref().unwrap();
1045-
let d = eq(&c, &a).unwrap();
1045+
let d = eq(c, &a).unwrap();
10461046
assert!(d.value(0));
10471047
assert!(d.value(1));
10481048
assert!(d.value(2));
@@ -1238,7 +1238,7 @@ mod tests {
12381238
let b: Int32Array = (100..200).map(Some).collect();
12391239
let b = b.slice(50, 50);
12401240
let b = b.as_any().downcast_ref::<Int32Array>().unwrap();
1241-
let actual = lt(&a, &b).unwrap();
1241+
let actual = lt(a, b).unwrap();
12421242
let expected: BooleanArray = (0..50).map(|_| Some(true)).collect();
12431243
assert_eq!(expected, actual);
12441244
}
@@ -1248,7 +1248,7 @@ mod tests {
12481248
let a: Int32Array = (0..100).map(Some).collect();
12491249
let a = a.slice(50, 50);
12501250
let a = a.as_any().downcast_ref::<Int32Array>().unwrap();
1251-
let actual = lt_scalar(&a, 200).unwrap();
1251+
let actual = lt_scalar(a, 200).unwrap();
12521252
let expected: BooleanArray = (0..50).map(|_| Some(true)).collect();
12531253
assert_eq!(expected, actual);
12541254
}

‎arrow/src/compute/kernels/take.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1015,7 +1015,7 @@ mod tests {
10151015

10161016
test_take_primitive_arrays_non_null::<Int64Type>(
10171017
vec![0, 10, 20, 30, 40, 50],
1018-
&index,
1018+
index,
10191019
None,
10201020
vec![Some(20), Some(30), None, None],
10211021
)
@@ -1036,7 +1036,7 @@ mod tests {
10361036

10371037
test_take_primitive_arrays::<Int64Type>(
10381038
vec![None, None, Some(20), Some(30), Some(40), Some(50)],
1039-
&index,
1039+
index,
10401040
None,
10411041
vec![Some(20), Some(30), None, None],
10421042
)
@@ -1291,7 +1291,7 @@ mod tests {
12911291
// boolean
12921292
test_take_boolean_arrays(
12931293
vec![Some(false), None, Some(true), Some(false), None],
1294-
&index,
1294+
index,
12951295
None,
12961296
vec![None, Some(false), Some(true), None],
12971297
);

‎arrow/src/datatypes/mod.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -796,11 +796,11 @@ mod tests {
796796
"Key": "Value"
797797
}
798798
}"#;
799-
let value: Value = serde_json::from_str(&json).unwrap();
799+
let value: Value = serde_json::from_str(json).unwrap();
800800
assert_eq!(expected, value);
801801

802802
// convert back to a schema
803-
let value: Value = serde_json::from_str(&json).unwrap();
803+
let value: Value = serde_json::from_str(json).unwrap();
804804
let schema2 = Schema::from(&value).unwrap();
805805

806806
assert_eq!(schema, schema2);
@@ -819,7 +819,7 @@ mod tests {
819819
],
820820
"metadata": {}
821821
}"#;
822-
let value: Value = serde_json::from_str(&json).unwrap();
822+
let value: Value = serde_json::from_str(json).unwrap();
823823
let schema = Schema::from(&value).unwrap();
824824
assert!(schema.metadata.is_empty());
825825

@@ -836,7 +836,7 @@ mod tests {
836836
}
837837
]
838838
}"#;
839-
let value: Value = serde_json::from_str(&json).unwrap();
839+
let value: Value = serde_json::from_str(json).unwrap();
840840
let schema = Schema::from(&value).unwrap();
841841
assert!(schema.metadata.is_empty());
842842
}

‎arrow/src/ffi.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ mod tests {
777777

778778
// perform some operation
779779
let array = array.as_any().downcast_ref::<Int32Array>().unwrap();
780-
let array = kernels::arithmetic::add(&array, &array).unwrap();
780+
let array = kernels::arithmetic::add(array, array).unwrap();
781781

782782
// verify
783783
assert_eq!(array, Int32Array::from(vec![2, 4, 6]));
@@ -982,7 +982,7 @@ mod tests {
982982

983983
// perform some operation
984984
let array = array.as_any().downcast_ref::<BooleanArray>().unwrap();
985-
let array = kernels::boolean::not(&array)?;
985+
let array = kernels::boolean::not(array)?;
986986

987987
// verify
988988
assert_eq!(

‎integration-testing/src/flight_client_scenarios/integration_test.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,7 @@ async fn send_batch(
128128
options: &writer::IpcWriteOptions,
129129
) -> Result {
130130
let (dictionary_flight_data, mut batch_flight_data) =
131-
arrow_flight::utils::flight_data_from_arrow_batch(batch, &options);
131+
arrow_flight::utils::flight_data_from_arrow_batch(batch, options);
132132

133133
upload_tx
134134
.send_all(&mut stream::iter(dictionary_flight_data).map(Ok))
@@ -166,7 +166,7 @@ async fn verify_data(
166166
consume_flight_location(
167167
location,
168168
ticket.clone(),
169-
&expected_data,
169+
expected_data,
170170
expected_schema.clone(),
171171
)
172172
.await?;

0 commit comments

Comments
 (0)