Skip to content

Commit

Permalink
Run clippy for tests in CI
Browse files Browse the repository at this point in the history
  • Loading branch information
msk committed Dec 10, 2024
1 parent a3245bc commit a472655
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
- name: Check formatting
run: cargo fmt -- --check
- name: Clippy
run: cargo clippy -- -D warnings
run: cargo clippy --tests -- -D warnings
- name: markdownlint
uses: articulate/actions-markdownlint@v1

Expand Down
11 changes: 8 additions & 3 deletions src/csv/reader.rs
Original file line number Diff line number Diff line change
Expand Up @@ -479,6 +479,7 @@ mod tests {
use serde_test::{assert_tokens, Token};
use std::net::Ipv4Addr;

#[allow(clippy::too_many_lines)]
fn test_data() -> (Vec<Vec<u8>>, Vec<Column>) {
let c0_v: Vec<i64> = vec![1, 3, 3, 5, 2, 1, 3];
let c1_v: Vec<_> = vec!["111a qwer", "b", "c", "d", "b", "111a qwer", "111a qwer"];
Expand Down Expand Up @@ -551,15 +552,15 @@ mod tests {
let mut row: Vec<u8> = vec![];
row.extend(c0.to_string().into_bytes());
row.extend_from_slice(b",");
row.extend(c1.to_string().into_bytes());
row.extend((*c1).to_string().into_bytes());
row.extend_from_slice(b",");
row.extend(c2.to_string().into_bytes());
row.extend_from_slice(b",");
row.extend(c3.to_string().into_bytes());
row.extend_from_slice(b",");
row.extend(c4.format(fmt).to_string().into_bytes());
row.extend_from_slice(b",");
row.extend(c5.to_string().into_bytes());
row.extend((*c5).to_string().into_bytes());
row.extend_from_slice(b",");
row.extend_from_slice(c6);
data.push(row);
Expand Down Expand Up @@ -640,7 +641,11 @@ mod tests {
FieldParser::Binary,
];
let (data, columns) = test_data();
let mut reader = Reader::new(data.iter().map(|d| d.as_slice()), data.len(), &parsers);
let mut reader = Reader::new(
data.iter().map(std::vec::Vec::as_slice),
data.len(),
&parsers,
);
let result: Vec<Column> = if let Some(batch) = reader.next_batch().unwrap() {
batch.columns().iter().map(|c| c.clone().into()).collect()
} else {
Expand Down
2 changes: 1 addition & 1 deletion src/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ mod tests {
.and_hms_opt(8, 0, 0)
.unwrap()
)
)
);
}

#[test]
Expand Down
15 changes: 9 additions & 6 deletions src/table.rs
Original file line number Diff line number Diff line change
Expand Up @@ -780,9 +780,8 @@ mod tests {
let c0 = Column::try_from_slice::<Int64Type>(&c0_v).unwrap();
let c1 = Column::try_from_slice::<Int64Type>(&c1_v).unwrap();
let c2 = Column::try_from_slice::<Int64Type>(&c2_v).unwrap();
let c_v: Vec<Column> = vec![c0, c1, c2];
let table =
Table::<i64>::new(Arc::new(schema), c_v, HashMap::new()).expect("invalid columns");
let table = Table::<i64>::new(Arc::new(schema), vec![c0, c1, c2], HashMap::new())
.expect("invalid columns");
let column_types = Arc::new(vec![
ColumnType::DateTime,
ColumnType::Int64,
Expand All @@ -801,6 +800,7 @@ mod tests {
}

#[test]
#[allow(clippy::too_many_lines)]
fn description_test() {
use crate::Element;
let schema = Schema::new(vec![
Expand Down Expand Up @@ -897,9 +897,12 @@ mod tests {
let c5 = Column::try_from_slice::<UInt64Type>(&c5_v).unwrap();
let c6_a: Arc<dyn Array> = Arc::new(BinaryArray::from(c6_v));
let c6 = Column::from(c6_a);
let c_v: Vec<Column> = vec![c0, c1, c2, c3, c4, c5, c6];
let table =
Table::<i64>::new(Arc::new(schema), c_v, HashMap::new()).expect("invalid columns");
let table = Table::<i64>::new(
Arc::new(schema),
vec![c0, c1, c2, c3, c4, c5, c6],
HashMap::new(),
)
.expect("invalid columns");
let column_types = Arc::new(vec![
ColumnType::Int64,
ColumnType::Utf8,
Expand Down

0 comments on commit a472655

Please sign in to comment.