diff options
author | Lars Wirzenius <liw@liw.fi> | 2021-02-03 09:11:49 +0200 |
---|---|---|
committer | Lars Wirzenius <liw@liw.fi> | 2021-02-04 09:14:01 +0200 |
commit | a2adcb5a90c15b473a2fcf114555443fba8a20ce (patch) | |
tree | 7ec36f244daa105b0da774d6705ef736f9135f64 /src/chunk.rs | |
parent | bf08ea67ca035fc0e78364450599cefff7cd9bc6 (diff) | |
download | obnam2-a2adcb5a90c15b473a2fcf114555443fba8a20ce.tar.gz |
refactor: have per-module error enums
This means that a function that parses step bindings can't return an
error that the document is missing a title. Such an error return would
be nonsensical, and we use the Rust type system to prevent it, at a
small cost of being a bit verbose.
Additional benefit is that the library portion of Obnam doesn't return
anyhow::Result values anymore.
Diffstat (limited to 'src/chunk.rs')
-rw-r--r-- | src/chunk.rs | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/src/chunk.rs b/src/chunk.rs index 4917b60..a67ed8c 100644 --- a/src/chunk.rs +++ b/src/chunk.rs @@ -30,12 +30,25 @@ pub struct GenerationChunk { chunk_ids: Vec<ChunkId>, } +/// All the errors that may be returned for `GenerationChunk` operations. +#[derive(Debug, thiserror::Error)] +pub enum GenerationChunkError { + #[error(transparent)] + Utf8Error(#[from] std::str::Utf8Error), + + #[error(transparent)] + SerdeJsonError(#[from] serde_json::Error), +} + +/// A result from a chunk operation. +pub type GenerationChunkResult<T> = Result<T, GenerationChunkError>; + impl GenerationChunk { pub fn new(chunk_ids: Vec<ChunkId>) -> Self { Self { chunk_ids } } - pub fn from_data_chunk(chunk: &DataChunk) -> anyhow::Result<Self> { + pub fn from_data_chunk(chunk: &DataChunk) -> GenerationChunkResult<Self> { let data = chunk.data(); let data = std::str::from_utf8(data)?; Ok(serde_json::from_str(data)?) @@ -53,7 +66,7 @@ impl GenerationChunk { self.chunk_ids.iter() } - pub fn to_data_chunk(&self) -> anyhow::Result<DataChunk> { + pub fn to_data_chunk(&self) -> GenerationChunkResult<DataChunk> { let json = serde_json::to_string(self)?; Ok(DataChunk::new(json.as_bytes().to_vec())) } |