Skip to content

Commit 25167c5

Browse files
committed
fix clippy
1 parent dd466ad commit 25167c5

File tree

5 files changed

+26
-13
lines changed

5 files changed

+26
-13
lines changed

src/query/codegen/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ common-expression = { path = "../expression" }
2020

2121
# TODO(andylokandy): Use the version from crates.io once
2222
# https://github.com/reem/rust-ordered-float/pull/110 is released.
23-
ordered-float = { git = "https://github.com/andylokandy/rust-ordered-float.git", branch = "as", features = ["serde"] }
2423
itertools = "0.10"
24+
ordered-float = { git = "https://github.com/andylokandy/rust-ordered-float.git", branch = "as", features = ["serde"] }
2525
serde = { version = "1.0.137", features = ["derive"] }
2626
serde_json = "1.0.81"

src/query/codegen/src/writes/arithmetics_type_v2.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,8 +114,8 @@ impl ResultTypeOfBinary for ({}, {}) {{
114114
type Modulo = {};
115115
type LeastSuper = {};
116116
}}",
117-
to_primitive_str(lhs.clone()),
118-
to_primitive_str(rhs.clone()),
117+
to_primitive_str(*lhs),
118+
to_primitive_str(*rhs),
119119
to_primitive_str(add_mul),
120120
to_primitive_str(minus),
121121
to_primitive_str(intdiv),
@@ -157,7 +157,7 @@ impl ResultTypeOfUnary for {} {{
157157
Some(self % rhs)
158158
}}
159159
}}",
160-
to_primitive_str(arg.clone()),
160+
to_primitive_str(*arg),
161161
to_primitive_str(negate),
162162
)
163163
.unwrap();
@@ -190,7 +190,7 @@ impl ResultTypeOfUnary for {} {{
190190
self.checked_rem(rhs)
191191
}}
192192
}}",
193-
to_primitive_str(arg.clone()),
193+
to_primitive_str(*arg),
194194
to_primitive_str(negate),
195195
)
196196
.unwrap();

src/query/functions-v2/tests/it/scalars/arithmetic.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use common_expression::types::NumberDataType;
1919
use common_expression::Column;
2020
use common_expression::ColumnFrom;
2121
use goldenfile::Mint;
22-
use ordered_float::OrderedFloat;
2322

2423
use super::run_ast;
2524

src/query/functions-v2/tests/it/scalars/math.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use common_expression::types::NumberDataType;
1919
use common_expression::Column;
2020
use common_expression::ColumnFrom;
2121
use goldenfile::Mint;
22-
use ordered_float::OrderedFloat;
2322

2423
use super::run_ast;
2524

src/query/functions-v2/tests/it/scalars/string.rs

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ use common_expression::types::NumberDataType;
1919
use common_expression::Column;
2020
use common_expression::ColumnFrom;
2121
use goldenfile::Mint;
22-
use ordered_float::OrderedFloat;
2322

2423
use super::run_ast;
2524

@@ -636,13 +635,29 @@ fn test_char(file: &mut impl Write) {
636635
run_ast(file, "char(65, null)", &[]);
637636

638637
let table = [
639-
("a", DataType::UInt8, Column::from_data(vec![66u8, 67])),
640-
("b", DataType::UInt8, Column::from_data(vec![98u8, 99])),
641-
("c", DataType::UInt8, Column::from_data(vec![68u8, 69])),
642-
("c2", DataType::UInt16, Column::from_data(vec![68u16, 69])),
638+
(
639+
"a",
640+
DataType::Number(NumberDataType::UInt8),
641+
Column::from_data(vec![66u8, 67]),
642+
),
643+
(
644+
"b",
645+
DataType::Number(NumberDataType::UInt8),
646+
Column::from_data(vec![98u8, 99]),
647+
),
648+
(
649+
"c",
650+
DataType::Number(NumberDataType::UInt8),
651+
Column::from_data(vec![68u8, 69]),
652+
),
653+
(
654+
"c2",
655+
DataType::Number(NumberDataType::UInt16),
656+
Column::from_data(vec![68u16, 69]),
657+
),
643658
(
644659
"a2",
645-
DataType::Nullable(Box::new(DataType::UInt8)),
660+
DataType::Nullable(Box::new(DataType::Number(NumberDataType::UInt8))),
646661
Column::from_data_with_validity(vec![66u8, 67], vec![true, false]),
647662
),
648663
];

0 commit comments

Comments
 (0)