Skip to content

Commit 87de6be

Browse files
authored
[AURON #1917] Clean up Clippy format/string lints (#1948)
# Which issue does this PR close? Closes #1917 # Rationale for this change Improve Rust code quality. # What changes are included in this PR? # Are there any user-facing changes? # How was this patch tested?
1 parent 6a833df commit 87de6be

File tree

10 files changed

+71
-97
lines changed

10 files changed

+71
-97
lines changed

Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,6 @@ while_let_loop = "allow"
7575
while_let_on_iterator = "allow"
7676
explicit_counter_loop = "allow"
7777

78-
# Format/String
79-
useless_format = "allow"
80-
uninlined_format_args = "allow"
81-
to_string_in_format_args = "allow"
82-
8378
# Code Style/Redundancy (Part 1)
8479
needless_borrow = "allow"
8580
needless_return = "allow"

native-engine/datafusion-ext-functions/src/spark_strings.rs

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ pub fn string_concat(args: &[ColumnarValue]) -> Result<ColumnarValue> {
176176
}
177177

178178
// concat
179-
let initial = Some("".to_string());
179+
let initial = Some(String::new());
180180
let result = args.iter().fold(initial, |mut acc, rhs| {
181181
if let Some(ref mut inner) = acc {
182182
match rhs {
@@ -401,8 +401,8 @@ mod test {
401401
// positive case
402402
let r = string_repeat(&vec![
403403
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
404-
Some(format!("123")),
405-
Some(format!("a")),
404+
Some("123".to_string()),
405+
Some("a".to_string()),
406406
None,
407407
]))),
408408
ColumnarValue::Scalar(ScalarValue::from(3_i32)),
@@ -416,8 +416,8 @@ mod test {
416416
// repeat with n < 0
417417
let r = string_repeat(&vec![
418418
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
419-
Some(format!("123")),
420-
Some(format!("a")),
419+
Some("123".to_string()),
420+
Some("a".to_string()),
421421
None,
422422
]))),
423423
ColumnarValue::Scalar(ScalarValue::from(-1_i32)),
@@ -431,8 +431,8 @@ mod test {
431431
// repeat with n = null
432432
let r = string_repeat(&vec![
433433
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
434-
Some(format!("123")),
435-
Some(format!("a")),
434+
Some("123".to_string()),
435+
Some("a".to_string()),
436436
None,
437437
]))),
438438
ColumnarValue::Scalar(ScalarValue::Int32(None)),
@@ -450,9 +450,9 @@ mod test {
450450
// positive case
451451
let r = string_split(&vec![
452452
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
453-
Some(format!("123,456,,,789,")),
454-
Some(format!("123")),
455-
Some(format!("")),
453+
Some("123,456,,,789,".to_string()),
454+
Some("123".to_string()),
455+
Some(String::new()),
456456
None,
457457
]))),
458458
ColumnarValue::Scalar(ScalarValue::from(",")),
@@ -485,16 +485,16 @@ mod test {
485485
// positive case
486486
let r = string_concat(&vec![
487487
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
488-
Some(format!("123")),
488+
Some("123".to_string()),
489489
None,
490490
]))),
491491
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
492-
Some(format!("444")),
493-
Some(format!("456")),
492+
Some("444".to_string()),
493+
Some("456".to_string()),
494494
]))),
495495
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
496-
Some(format!("")),
497-
Some(format!("")),
496+
Some(String::new()),
497+
Some(String::new()),
498498
]))),
499499
ColumnarValue::Scalar(ScalarValue::from("SomeScalar")),
500500
])?;
@@ -511,16 +511,16 @@ mod test {
511511
let r = string_concat_ws(&vec![
512512
ColumnarValue::Scalar(ScalarValue::from("||")),
513513
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
514-
Some(format!("123")),
514+
Some("123".to_string()),
515515
None,
516516
]))),
517517
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
518518
None,
519-
Some(format!("456")),
519+
Some("456".to_string()),
520520
]))),
521521
ColumnarValue::Array(Arc::new(StringArray::from_iter(vec![
522-
Some(format!("")),
523-
Some(format!("")),
522+
Some(String::new()),
523+
Some(String::new()),
524524
]))),
525525
ColumnarValue::Array(Arc::new({
526526
let mut list_builder = ListBuilder::new(StringBuilder::new());

native-engine/datafusion-ext-plans/src/agg_exec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -765,7 +765,7 @@ mod fuzztest {
765765
let partial_agg = Arc::new(AggExec::try_new(
766766
HashAgg,
767767
vec![GroupingExpr {
768-
field_name: format!("key"),
768+
field_name: "key".to_string(),
769769
expr: phys_expr::col("key", &schema)?,
770770
}],
771771
vec![
@@ -792,7 +792,7 @@ mod fuzztest {
792792
let final_agg = Arc::new(AggExec::try_new(
793793
HashAgg,
794794
vec![GroupingExpr {
795-
field_name: format!("key"),
795+
field_name: "key".to_string(),
796796
expr: phys_expr::col("key", &schema)?,
797797
}],
798798
vec![

native-engine/datafusion-ext-plans/src/common/cached_exprs_evaluator.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ struct CachedExpr {
331331

332332
impl Display for CachedExpr {
333333
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
334-
write!(f, "{:?}", self)
334+
write!(f, "{self:?}")
335335
}
336336
}
337337

native-engine/datafusion-ext-plans/src/common/execution_context.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -593,7 +593,7 @@ impl ExecutionContext {
593593
if !task_running {
594594
panic!("output_with_sender[{desc}] canceled due to task finished/killed");
595595
} else {
596-
panic!("output_with_sender[{desc}] error: {}", err.to_string());
596+
panic!("output_with_sender[{desc}] error: {err}");
597597
}
598598
}
599599
Ok::<_, DataFusionError>(())

native-engine/datafusion-ext-plans/src/common/row_null_checker.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ impl RowNullChecker {
127127
}
128128
other => {
129129
// For unsupported types, panic
130-
panic!("unsupported data type in RowNullChecker: {:?}", other)
130+
panic!("unsupported data type in RowNullChecker: {other:?}")
131131
}
132132
}
133133
}

0 commit comments

Comments
 (0)