Skip to content

Commit b7978b2

Browse files
committed
Clippy/fmt things
Signed-off-by: Adam Gutglick <[email protected]>
1 parent 0bce9b4 commit b7978b2

File tree

11 files changed

+11
-12
lines changed

11 files changed

+11
-12
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ tokio-stream = "0.1.17"
202202
tokio-util = { version = "0.7.16" }
203203
tpchgen = { version = "2" }
204204
tpchgen-arrow = { version = "2" }
205-
tracing = { version = "0.1.41" }
205+
tracing = { version = "0.1.41", default-features = false }
206206
tracing-perfetto = "0.1.5"
207207
tracing-subscriber = "0.3"
208208
url = "2.5.7"

bench-vortex/src/fineweb/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ use datafusion::datasource::listing::ListingTableConfig;
1111
use datafusion::datasource::listing::ListingTableUrl;
1212
use datafusion::prelude::SessionContext;
1313
use futures::StreamExt;
14-
use tracing::info;
1514
use parquet::arrow::async_writer::AsyncFileWriter;
15+
use tracing::info;
1616
use url::Url;
1717
use vortex::compressor::CompactCompressor;
1818
use vortex::file::WriteOptionsSessionExt;

bench-vortex/src/realnest/gharchive.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ use datafusion::datasource::listing::ListingTableConfig;
1616
use datafusion::datasource::listing::ListingTableUrl;
1717
use datafusion::prelude::SessionContext;
1818
use futures::StreamExt;
19-
use tracing::info;
2019
use parquet::arrow::async_writer::AsyncFileWriter;
20+
use tracing::info;
2121
use url::Url;
2222
use vortex::compressor::CompactCompressor;
2323
use vortex::file::WriteOptionsSessionExt;

bench-vortex/src/tpch/tpch_benchmark.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ use anyhow::anyhow;
1313
use datafusion::prelude::SessionContext;
1414
use ddb::DuckDBCtx;
1515
use glob::Pattern;
16-
use tracing::info;
17-
use tracing::warn;
1816
use similar::ChangeTag;
1917
use similar::TextDiff;
2018
use tokio::runtime::Runtime;
19+
use tracing::info;
20+
use tracing::warn;
2121
use url::Url;
2222

2323
use crate::BenchmarkDataset;

bench-vortex/src/tpch/tpchgen.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ use arrow_schema::SchemaRef;
1414
use futures::StreamExt;
1515
use futures::TryStreamExt;
1616
use futures::stream;
17-
use tracing::info;
1817
use parquet::arrow::AsyncArrowWriter;
1918
use parquet::basic::Compression;
2019
use parquet::file::properties::WriterProperties;
@@ -30,6 +29,7 @@ use tpchgen::generators::PartSuppGenerator;
3029
use tpchgen::generators::RegionGenerator;
3130
use tpchgen::generators::SupplierGenerator;
3231
use tpchgen_arrow::RecordBatchIterator;
32+
use tracing::info;
3333
use vortex::array::ArrayRef;
3434
use vortex::array::arrow::FromArrowArray;
3535
use vortex::array::stream::ArrayStreamAdapter;

bench-vortex/src/utils/parquet.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,9 @@ use arrow_schema::SchemaRef;
1919
use lance::dataset::Dataset as LanceDataset;
2020
use lance::dataset::WriteParams;
2121
use lance_encoding::version::LanceFileVersion;
22-
use tracing::info;
2322
use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
2423
use tokio::fs::create_dir_all;
24+
use tracing::info;
2525

2626
use crate::utils::file::idempotent_async;
2727

vortex-datafusion/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ moka = { workspace = true, features = ["future"] }
3535
object_store = { workspace = true }
3636
tokio = { workspace = true, features = ["rt-multi-thread", "fs"] }
3737
tokio-stream = { workspace = true }
38-
tracing = { workspace = true }
38+
tracing = { workspace = true, features = ["std", "attributes"] }
3939
vortex = { workspace = true, features = ["object_store", "tokio"] }
4040
vortex-utils = { workspace = true, features = ["dashmap"] }
4141

vortex-ffi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ mimalloc = { workspace = true, optional = true }
2727
object_store = { workspace = true, features = ["aws", "azure", "gcp"] }
2828
paste = { workspace = true }
2929
prost = { workspace = true }
30-
tracing = { workspace = true }
30+
tracing = { workspace = true, features = ["std", "log"] }
3131
tracing-subscriber = { workspace = true, features = ["env-filter"] }
3232
url = { workspace = true, features = [] }
3333
vortex = { workspace = true, features = ["object_store"] }

vortex-jni/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ parking_lot = { workspace = true }
2727
prost = { workspace = true }
2828
thiserror = { workspace = true }
2929
tokio = { workspace = true, features = ["rt-multi-thread"] }
30-
tracing = { workspace = true }
30+
tracing = { workspace = true, features = ["std", "log"] }
3131
tracing-subscriber = { workspace = true, features = ["env-filter"] }
3232
url = { workspace = true }
3333
vortex = { workspace = true, features = ["object_store", "files", "tokio"] }

vortex-jni/src/logging.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use tracing_subscriber::EnvFilter;
1313
// Ensure the logger is initialized only once
1414
static LOGGER_INIT: AtomicBool = AtomicBool::new(false);
1515

16-
#[expect(clippy::expect_used, reason = "logger initialization must succeed")]
1716
#[unsafe(no_mangle)]
1817
pub extern "system" fn Java_dev_vortex_jni_NativeLogging_initLogging(
1918
_env: JNIEnv,

0 commit comments

Comments
 (0)