Skip to content

Commit 4147043

Browse files
authored
Merge pull request #503 from splitgraph/fix-ci
Roll back ahash to 0.8.7 do avoid conflicts
2 parents 79239da + b172f08 commit 4147043

File tree

6 files changed

+18
-24
lines changed

6 files changed

+18
-24
lines changed

.github/workflows/ci.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
- name: Install minimal nightly with clippy and rustfmt
3535
uses: dtolnay/rust-toolchain@master
3636
with:
37-
toolchain: nightly-2024-02-01
37+
toolchain: nightly
3838
components: rustfmt, clippy
3939

4040
- name: Install tool for formatting Cargo.toml files

Cargo.lock

+16-16
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/context/mod.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -205,11 +205,9 @@ impl SeafowlContext {
205205

206206
#[cfg(test)]
207207
pub mod test_utils {
208-
use std::sync::Arc;
209-
210208
use crate::config::context::build_context;
211209
use crate::config::schema;
212-
use crate::config::schema::{Catalog, SeafowlConfig, Sqlite};
210+
use crate::config::schema::{Catalog, Sqlite};
213211
use sqlx::sqlite::SqliteJournalMode;
214212

215213
use super::*;

src/context/physical.rs

-1
Original file line numberDiff line numberDiff line change
@@ -901,7 +901,6 @@ impl SeafowlContext {
901901
mod tests {
902902
use crate::context::test_utils::in_memory_context_with_test_db;
903903
use datafusion::assert_batches_eq;
904-
use std::sync::Arc;
905904

906905
use super::super::test_utils::in_memory_context;
907906
use super::*;

src/datafusion/parser.rs

-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ use sqlparser::{
3939
};
4040
use std::collections::{HashMap, VecDeque};
4141
use std::str::FromStr;
42-
use std::string::ToString;
4342

4443
// Use `Parser::expected` instead, if possible
4544
macro_rules! parser_err {

src/wasm_udf/wasm.rs

-2
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ use datafusion_expr::ColumnarValue;
2727
use std::sync::Arc;
2828
use std::vec;
2929

30-
use rmp_serde;
3130
use rmp_serde::Serializer;
32-
use serde;
3331

3432
use serde::Serialize;
3533

0 commit comments

Comments
 (0)