From d7d0c0a4035c8f3575f7fa5cf9231ccb18d7c976 Mon Sep 17 00:00:00 2001 From: Faiaz Sanaulla Date: Wed, 24 Jan 2024 15:08:32 +0100 Subject: [PATCH] VTX-4075: make clippy happy --- datafusion/common/src/error.rs | 2 -- datafusion/physical-expr/src/window/cume_dist.rs | 1 - datafusion/physical-expr/src/window/rank.rs | 2 -- datafusion/sql/src/statement.rs | 2 +- 4 files changed, 1 insertion(+), 6 deletions(-) diff --git a/datafusion/common/src/error.rs b/datafusion/common/src/error.rs index 9114c669ab8b..7404246c7033 100644 --- a/datafusion/common/src/error.rs +++ b/datafusion/common/src/error.rs @@ -580,7 +580,6 @@ mod test { #[cfg(not(feature = "backtrace"))] #[test] - #[allow(clippy::unnecessary_literal_unwrap)] fn test_disabled_backtrace() { let res: Result<(), DataFusionError> = plan_err!("Err"); let res = res.unwrap_err().to_string(); @@ -644,7 +643,6 @@ mod test { } #[test] - #[allow(clippy::unnecessary_literal_unwrap)] fn test_make_error_parse_input() { let res: Result<(), DataFusionError> = plan_err!("Err"); let res = res.unwrap_err(); diff --git a/datafusion/physical-expr/src/window/cume_dist.rs b/datafusion/physical-expr/src/window/cume_dist.rs index edef77c51c31..49ed2a74dff6 100644 --- a/datafusion/physical-expr/src/window/cume_dist.rs +++ b/datafusion/physical-expr/src/window/cume_dist.rs @@ -117,7 +117,6 @@ mod tests { } #[test] - #[allow(clippy::single_range_in_vec_init)] fn test_cume_dist() -> Result<()> { let r = cume_dist("arr".into()); diff --git a/datafusion/physical-expr/src/window/rank.rs b/datafusion/physical-expr/src/window/rank.rs index 9bc36728f46e..e24bfee3c060 100644 --- a/datafusion/physical-expr/src/window/rank.rs +++ b/datafusion/physical-expr/src/window/rank.rs @@ -227,7 +227,6 @@ mod tests { test_i32_result(expr, vec![0..2, 2..3, 3..6, 6..7, 7..8], expected) } - #[allow(clippy::single_range_in_vec_init)] fn test_without_rank(expr: &Rank, expected: Vec) -> Result<()> { test_i32_result(expr, vec![0..8], expected) } @@ -276,7 +275,6 @@ mod tests { } #[test] - #[allow(clippy::single_range_in_vec_init)] fn test_percent_rank() -> Result<()> { let r = percent_rank("arr".into()); diff --git a/datafusion/sql/src/statement.rs b/datafusion/sql/src/statement.rs index 9d9c55361a5e..a3336a0385c8 100644 --- a/datafusion/sql/src/statement.rs +++ b/datafusion/sql/src/statement.rs @@ -1017,7 +1017,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> { expr_to_columns(&filter_expr, &mut using_columns)?; let filter_expr = normalize_col_with_schemas_and_ambiguity_check( filter_expr, - &[&[&scan.schema()]], + &[&[(scan.schema())]], &[using_columns], )?; LogicalPlan::Filter(Filter::try_new(filter_expr, Arc::new(scan))?)