Skip to content

Commit

Permalink
cleanup per pr comments
Browse files Browse the repository at this point in the history
  • Loading branch information
lif committed Feb 1, 2024
1 parent 3e85752 commit d36c61c
Showing 1 changed file with 4 additions and 5 deletions.
9 changes: 4 additions & 5 deletions sled-agent/src/dump_setup.rs
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,11 @@ const ARCHIVAL_INTERVAL: Duration = Duration::from_secs(300);

// we sure are passing a lot of Utf8PathBufs around, let's be careful about it
#[derive(AsRef, Clone, Debug, Eq, From, Hash, Ord, PartialEq, PartialOrd)]
pub(self) struct DumpSlicePath(Utf8PathBuf);
struct DumpSlicePath(Utf8PathBuf);
#[derive(AsRef, Clone, Debug, Eq, From, Hash, Ord, PartialEq, PartialOrd)]
pub(self) struct DebugDataset(Utf8PathBuf);
struct DebugDataset(Utf8PathBuf);
#[derive(AsRef, Clone, Debug, Eq, From, Hash, Ord, PartialEq, PartialOrd)]
pub(self) struct CoreDataset(Utf8PathBuf);
struct CoreDataset(Utf8PathBuf);

#[derive(AsRef, Clone, From)]
pub(super) struct CoreZpool(pub ZpoolName);
Expand Down Expand Up @@ -299,7 +299,7 @@ impl DumpSetup {
}

#[derive(Debug, thiserror::Error)]
pub(self) enum ZfsGetError {
enum ZfsGetError {
#[error("Error executing 'zfs get' command: {0}")]
IoError(#[from] std::io::Error),
#[error("Output of 'zfs get' was not only not an integer string, it wasn't even UTF-8: {0}")]
Expand Down Expand Up @@ -1005,7 +1005,6 @@ impl DumpSetupWorker {
}
}

#[cfg_attr(test, allow(dead_code))] // mock doesn't construct Tokio variant
#[derive(thiserror::Error, Debug)]
pub enum ArchiveLogsError {
#[error("I/O error: {0}")]
Expand Down

0 comments on commit d36c61c

Please sign in to comment.