Skip to content

Commit c9f4ea1

Browse files
committed
clippy
Signed-off-by: jayzhan211 <jayzhan211@gmail.com>
1 parent 12620d3 commit c9f4ea1

2 files changed

Lines changed: 15 additions & 13 deletions

File tree

datafusion/common/src/scalar.rs

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3314,13 +3314,14 @@ mod tests {
33143314

33153315
let array = ScalarValue::new_list(scalars.as_slice(), &DataType::Utf8);
33163316
let result = as_list_array(&array).unwrap();
3317-
3317+
33183318
let expected = wrap_into_list_array(&[&StringArray::from(vec![
33193319
"rust",
33203320
"arrow",
33213321
"data-fusion",
3322-
])]).unwrap();
3323-
3322+
])])
3323+
.unwrap();
3324+
33243325
assert_eq!(result, &expected);
33253326
}
33263327

@@ -3353,12 +3354,10 @@ mod tests {
33533354

33543355
#[test]
33553356
fn iter_to_array_string_test() {
3356-
let arr1 = wrap_into_list_array(&[&StringArray::from(vec![
3357-
"foo", "bar", "baz",
3358-
])]).unwrap();
3359-
let arr2 = wrap_into_list_array(&[&StringArray::from(vec![
3360-
"rust", "world",
3361-
])]).unwrap();
3357+
let arr1 = wrap_into_list_array(&[&StringArray::from(vec!["foo", "bar", "baz"])])
3358+
.unwrap();
3359+
let arr2 =
3360+
wrap_into_list_array(&[&StringArray::from(vec!["rust", "world"])]).unwrap();
33623361

33633362
let scalars = vec![
33643363
ScalarValue::List(Arc::new(arr1)),
@@ -4528,13 +4527,16 @@ mod tests {
45284527
// Define list-of-structs scalars
45294528

45304529
let nl0_array = ScalarValue::iter_to_array(vec![s0.clone(), s1.clone()]).unwrap();
4531-
let nl0 = ScalarValue::List(Arc::new(wrap_into_list_array(&[&nl0_array]).unwrap()));
4530+
let nl0 =
4531+
ScalarValue::List(Arc::new(wrap_into_list_array(&[&nl0_array]).unwrap()));
45324532

45334533
let nl1_array = ScalarValue::iter_to_array(vec![s2.clone()]).unwrap();
4534-
let nl1 = ScalarValue::List(Arc::new(wrap_into_list_array(&[&nl1_array]).unwrap()));
4534+
let nl1 =
4535+
ScalarValue::List(Arc::new(wrap_into_list_array(&[&nl1_array]).unwrap()));
45354536

45364537
let nl2_array = ScalarValue::iter_to_array(vec![s1.clone()]).unwrap();
4537-
let nl2 = ScalarValue::List(Arc::new(wrap_into_list_array(&[&nl2_array]).unwrap()));
4538+
let nl2 =
4539+
ScalarValue::List(Arc::new(wrap_into_list_array(&[&nl2_array]).unwrap()));
45384540

45394541
// iter_to_array for list-of-struct
45404542
let array = ScalarValue::iter_to_array(vec![nl0, nl1, nl2]).unwrap();

datafusion/common/src/utils.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -348,7 +348,7 @@ pub fn wrap_into_list_array(arr: &[&dyn Array]) -> Result<ListArray> {
348348
let lens = arr.iter().map(|x| x.len()).collect::<Vec<_>>();
349349
// Assume data type is consistent
350350
let data_type = arr[0].data_type().to_owned();
351-
let offsets = OffsetBuffer::from_lengths(lens.into_iter());
351+
let offsets = OffsetBuffer::from_lengths(lens);
352352
// let elements = arr.into_iter().map(|a| a.as_ref()).collect::<Vec<_>>();
353353
Ok(ListArray::new(
354354
Arc::new(Field::new("item", data_type, true)),

0 commit comments

Comments
 (0)