summaryrefslogtreecommitdiff
path: root/src/chunker.rs
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2021-02-03 09:11:49 +0200
committerLars Wirzenius <liw@liw.fi>2021-02-04 09:14:01 +0200
commita2adcb5a90c15b473a2fcf114555443fba8a20ce (patch)
tree7ec36f244daa105b0da774d6705ef736f9135f64 /src/chunker.rs
parentbf08ea67ca035fc0e78364450599cefff7cd9bc6 (diff)
downloadobnam2-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/chunker.rs')
-rw-r--r--src/chunker.rs14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/chunker.rs b/src/chunker.rs
index 145b1db..f424833 100644
--- a/src/chunker.rs
+++ b/src/chunker.rs
@@ -9,6 +9,14 @@ pub struct Chunker {
handle: std::fs::File,
}
+#[derive(Debug, thiserror::Error)]
+pub enum ChunkerError {
+ #[error(transparent)]
+ IoError(#[from] std::io::Error),
+}
+
+pub type ChunkerResult<T> = Result<T, ChunkerError>;
+
impl Chunker {
pub fn new(chunk_size: usize, handle: std::fs::File) -> Self {
let mut buf = vec![];
@@ -20,7 +28,7 @@ impl Chunker {
}
}
- pub fn read_chunk(&mut self) -> anyhow::Result<Option<(ChunkMeta, DataChunk)>> {
+ pub fn read_chunk(&mut self) -> ChunkerResult<Option<(ChunkMeta, DataChunk)>> {
let mut used = 0;
loop {
@@ -44,9 +52,9 @@ impl Chunker {
}
impl Iterator for Chunker {
- type Item = anyhow::Result<(ChunkMeta, DataChunk)>;
+ type Item = ChunkerResult<(ChunkMeta, DataChunk)>;
- fn next(&mut self) -> Option<anyhow::Result<(ChunkMeta, DataChunk)>> {
+ fn next(&mut self) -> Option<ChunkerResult<(ChunkMeta, DataChunk)>> {
match self.read_chunk() {
Ok(None) => None,
Ok(Some((meta, chunk))) => Some(Ok((meta, chunk))),