Deuxfleurs/garage
47
55
Fork 71
Code Issues 98 Pull requests 14 Releases 30 Wiki Activity

Uniformize tracing::* imports (hopefully fixes 32-bit build) #341

Merged
lx merged 1 commit from fix-32bit-build into main 2022-07-18 10:14:06 +00:00
Conversation 0 Commits 1 Files changed 4 +3 -4
4 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/db/lib.rs
View file

@ -1,3 +1,6 @@
#[macro_use]
extern crate tracing;
pub mod lmdb_adapter; pub mod lmdb_adapter;
pub mod sled_adapter; pub mod sled_adapter;
pub mod sqlite_adapter; pub mod sqlite_adapter;

1
src/db/lmdb_adapter.rs
View file

@ -345,7 +345,6 @@ pub fn recommended_map_size() -> usize {
#[cfg(target_pointer_width = "32")] #[cfg(target_pointer_width = "32")]
pub fn recommended_map_size() -> usize { pub fn recommended_map_size() -> usize {
use log::warn;
warn!("LMDB is not recommended on 32-bit systems, database size will be limited"); warn!("LMDB is not recommended on 32-bit systems, database size will be limited");
1usize << 30 1usize << 30
} }

2
src/db/sqlite_adapter.rs
View file

@ -6,8 +6,6 @@ use std::pin::Pin;
use std::ptr::NonNull; use std::ptr::NonNull;
use std::sync::{Arc, Mutex, MutexGuard}; use std::sync::{Arc, Mutex, MutexGuard};
use tracing::trace;
use rusqlite::{params, Connection, Rows, Statement, Transaction}; use rusqlite::{params, Connection, Rows, Statement, Transaction};
use crate::{ use crate::{

1
src/util/background/worker.rs
View file

@ -9,7 +9,6 @@ use futures::StreamExt;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tokio::select; use tokio::select;
use tokio::sync::{mpsc, watch}; use tokio::sync::{mpsc, watch};
use tracing::*;
use crate::background::WorkerInfo; use crate::background::WorkerInfo;
use crate::error::Error; use crate::error::Error;