Merge updates.

Omega359 · Mar 9, 2024 · 8abb99a · 8abb99a
1 parent ea89f71
commit 8abb99a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock
diff --git a/datafusion/proto/src/logical_plan/from_proto.rs b/datafusion/proto/src/logical_plan/from_proto.rs
@@ -48,13 +48,12 @@ use datafusion_expr::expr::Unnest;
 use datafusion_expr::window_frame::{check_window_frame, regularize_window_order_by};
 use datafusion_expr::{
     acosh, array, array_append, array_concat, array_distinct, array_element,
-    array_except, array_intersect,
-    array_pop_back, array_pop_front, array_position, array_positions, array_prepend,
-    array_remove, array_remove_all, array_remove_n, array_repeat, array_replace,
-    array_replace_all, array_replace_n, array_resize, array_slice, array_sort,
-    array_union, arrow_typeof, ascii, asinh, atan, atan2, atanh, bit_length, btrim, cbrt,
-    ceil, character_length, chr, coalesce, concat_expr, concat_ws_expr, cos, cosh, cot,
-    degrees, digest, ends_with, exp,
+    array_except, array_intersect, array_pop_back, array_pop_front, array_position,
+    array_positions, array_prepend, array_remove, array_remove_all, array_remove_n,
+    array_repeat, array_replace, array_replace_all, array_replace_n, array_resize,
+    array_slice, array_sort, array_union, arrow_typeof, ascii, asinh, atan, atan2, atanh,
+    bit_length, btrim, cbrt, ceil, character_length, chr, coalesce, concat_expr,
+    concat_ws_expr, cos, cosh, cot, degrees, digest, ends_with, exp,
     expr::{self, InList, Sort, WindowFunction},
     factorial, find_in_set, flatten, floor, gcd, initcap, iszero, lcm, left, levenshtein,
     ln, log, log10, log2,