aboutsummaryrefslogtreecommitdiff
path: root/src/model
diff options
context:
space:
mode:
Diffstat (limited to 'src/model')
-rw-r--r--src/model/Cargo.toml2
-rw-r--r--src/model/block.rs8
-rw-r--r--src/model/lib.rs2
3 files changed, 7 insertions, 5 deletions
diff --git a/src/model/Cargo.toml b/src/model/Cargo.toml
index 10a4c838..4465af1c 100644
--- a/src/model/Cargo.toml
+++ b/src/model/Cargo.toml
@@ -23,7 +23,7 @@ async-trait = "0.1.7"
arc-swap = "1.0"
err-derive = "0.3"
hex = "0.4"
-log = "0.4"
+tracing = "0.1.30"
rand = "0.8"
zstd = { version = "0.9", default-features = false }
diff --git a/src/model/block.rs b/src/model/block.rs
index 9e939c24..ddda5e57 100644
--- a/src/model/block.rs
+++ b/src/model/block.rs
@@ -5,14 +5,16 @@ use std::time::{Duration, SystemTime};
use arc_swap::ArcSwapOption;
use async_trait::async_trait;
+use serde::{Deserialize, Serialize};
+use zstd::stream::{decode_all as zstd_decode, Encoder};
+
use futures::future::*;
use futures::select;
-use opentelemetry::KeyValue;
-use serde::{Deserialize, Serialize};
use tokio::fs;
use tokio::io::{AsyncReadExt, AsyncWriteExt};
use tokio::sync::{watch, Mutex, Notify};
-use zstd::stream::{decode_all as zstd_decode, Encoder};
+
+use opentelemetry::KeyValue;
use garage_util::data::*;
use garage_util::error::*;
diff --git a/src/model/lib.rs b/src/model/lib.rs
index c8677603..6da86fc6 100644
--- a/src/model/lib.rs
+++ b/src/model/lib.rs
@@ -1,5 +1,5 @@
#[macro_use]
-extern crate log;
+extern crate tracing;
pub mod permission;