Move counters to conserve::counters

src/backup.rs

@@ -30,9 +30,9 @@ use tracing::{error, warn};
 
 use crate::blockdir::Address;
 use crate::change::Change;
+use crate::counters::Counter;
 use crate::entry::EntryValue;
 use crate::io::read_with_retries;
-use crate::monitor::counters::Counter;
 use crate::monitor::Monitor;
 use crate::stats::{
     write_compressed_size, write_count, write_duration, write_size, IndexWriterStats,

src/blockdir.rs

@@ -38,7 +38,7 @@ use tracing::{instrument, trace};
 use crate::backup::BackupStats;
 use crate::blockhash::BlockHash;
 use crate::compress::snappy::{Compressor, Decompressor};
-use crate::monitor::counters::Counter;
+use crate::counters::Counter;
 use crate::monitor::Monitor;
 use crate::transport::{ListDir, Transport};
 use crate::*;

src/monitor/counters.rs → src/counters.rs

@@ -1,8 +1,10 @@
-//! Track counters.
+// Copyright 2023 Martin Pool
+
+//! Track counters of the number of files, bytes, blocks, etc, processed.
+//!
+//! Library code sets counters through the [Monitor] interface.
 
 use std::fmt::{self, Debug};
-use std::iter::Map;
-use std::slice;
 use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::Relaxed;
 
@@ -12,6 +14,7 @@ use strum_macros::{EnumCount, EnumIter};
 
 #[derive(Debug, Clone, Copy, Eq, PartialEq, EnumCount, EnumIter)]
 pub enum Counter {
+    /// Number of files processed.
     Files,
     FileBytes,
     Dirs,

src/lib.rs

@@ -21,6 +21,7 @@ pub mod blockdir;
 pub mod blockhash;
 pub mod change;
 pub mod compress;
+pub mod counters;
 mod diff;
 pub mod entry;
 pub mod errors;

src/monitor/collect.rs

@@ -10,11 +10,10 @@ use std::sync::atomic::AtomicUsize;
 use std::sync::atomic::Ordering::Relaxed;
 use std::sync::{Arc, Mutex, Weak};
 
-use crate::{Apath, GarbageCollectionLock};
-
-use super::counters::{Counter, Counters};
 use super::task::{Task, TaskList, TaskState};
 use super::{Monitor, Problem};
+use crate::counters::{Counter, Counters};
+use crate::{Apath, GarbageCollectionLock};
 
 /// A monitor that collects information for later inspection.
 ///

src/monitor/mod.rs

@@ -2,21 +2,13 @@
 
 //! Communication from the library to a monitor: a test, a UI, etc.
 
-#![allow(unused_imports)]
-
 pub mod collect;
-pub mod counters;
 pub mod task;
 
 use std::fmt::Debug;
 
-use strum_macros::{EnumCount, EnumIter};
-
-use self::counters::Counter;
 use self::task::Task;
-use crate::Apath;
-
-pub use counters::Counters;
+use crate::counters::Counter;
 
 pub trait Monitor: Send + Sync + 'static {
     /// Notify that a counter increased by a given amount.

src/restore.rs

@@ -27,8 +27,8 @@ use time::OffsetDateTime;
 use tracing::{error, instrument, trace, warn};
 
 use crate::band::BandSelectionPolicy;
+use crate::counters::Counter;
 use crate::io::{directory_is_empty, ensure_dir_exists};
-use crate::monitor::counters::Counter;
 use crate::monitor::Monitor;
 use crate::stats::RestoreStats;
 use crate::unix_mode::UnixMode;

src/termui/monitor.rs

@@ -8,8 +8,9 @@ use std::time::Duration;
 
 use nutmeg::{Destination, View};
 
+use crate::counters::{Counter, Counters};
 use crate::monitor::task::{Task, TaskList};
-use crate::monitor::{counters::Counter, Counters, Monitor, Problem};
+use crate::monitor::{Monitor, Problem};
 
 pub struct TermUiMonitor {
     // operation: Operation,

src/tree.rs

@@ -15,7 +15,7 @@
 
 use std::sync::Arc;
 
-use crate::monitor::counters::Counter;
+use crate::counters::Counter;
 use crate::monitor::Monitor;
 use crate::*;