diff options
| author | Alex Auvolat <alex@adnab.me> | 2022-07-15 18:31:19 +0200 |
|---|---|---|
| committer | Alex Auvolat <alex@adnab.me> | 2022-07-15 18:31:19 +0200 |
| commit | ac03fa7937d9da29d2358343a499fe9d15ac5f7c (patch) | |
| tree | 192cae10cca09569ed5a3c897467158c193d6ccf | |
| parent | 4f38cadf6e2963a652ed28327d1c2ccfa2ebb2b7 (diff) | |
| download | garage-fix-32bit-build.tar.gz garage-fix-32bit-build.zip | |
Uniformize tracing::* imports (hopefully fixes 32-bit build)fix-32bit-build
| -rw-r--r-- | src/db/lib.rs | 3 | ||||
| -rw-r--r-- | src/db/lmdb_adapter.rs | 1 | ||||
| -rw-r--r-- | src/db/sqlite_adapter.rs | 2 | ||||
| -rw-r--r-- | src/util/background/worker.rs | 1 |
4 files changed, 3 insertions, 4 deletions
diff --git a/src/db/lib.rs b/src/db/lib.rs index 8188c715..f185114e 100644 --- a/src/db/lib.rs +++ b/src/db/lib.rs @@ -1,3 +1,6 @@ +#[macro_use] +extern crate tracing; + pub mod lmdb_adapter; pub mod sled_adapter; pub mod sqlite_adapter; diff --git a/src/db/lmdb_adapter.rs b/src/db/lmdb_adapter.rs index fdb254c6..c036c990 100644 --- a/src/db/lmdb_adapter.rs +++ b/src/db/lmdb_adapter.rs @@ -345,7 +345,6 @@ pub fn recommended_map_size() -> usize { #[cfg(target_pointer_width = "32")] pub fn recommended_map_size() -> usize { - use log::warn; warn!("LMDB is not recommended on 32-bit systems, database size will be limited"); 1usize << 30 } diff --git a/src/db/sqlite_adapter.rs b/src/db/sqlite_adapter.rs index 97a78b07..886fda6e 100644 --- a/src/db/sqlite_adapter.rs +++ b/src/db/sqlite_adapter.rs @@ -6,8 +6,6 @@ use std::pin::Pin; use std::ptr::NonNull; use std::sync::{Arc, Mutex, MutexGuard}; -use tracing::trace; - use rusqlite::{params, Connection, Rows, Statement, Transaction}; use crate::{ diff --git a/src/util/background/worker.rs b/src/util/background/worker.rs index 7f573a07..f5e3addb 100644 --- a/src/util/background/worker.rs +++ b/src/util/background/worker.rs @@ -9,7 +9,6 @@ use futures::StreamExt; use serde::{Deserialize, Serialize}; use tokio::select; use tokio::sync::{mpsc, watch}; -use tracing::*; use crate::background::WorkerInfo; use crate::error::Error; |