Implement error handling for chunker and id

rustic-rs · May 3, 2023 · 8adc164 · 8adc164
1 parent e8e56e4
commit 8adc164
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/crates/rustic_core/src/chunker.rs b/crates/rustic_core/src/chunker.rs
@@ -2,8 +2,11 @@ use std::io::{self, Read};
 
 use rand::{thread_rng, Rng};
 
-use crate::{cdc::polynom::{Polynom, Polynom64}, RusticResult};
 use crate::cdc::rolling_hash::{Rabin64, RollingHash64};
+use crate::{
+ cdc::polynom::{Polynom, Polynom64},
+ RusticErrorKind, RusticResult,
+};
 
 use crate::error::PolynomialErrorKind;
 
@@ -148,7 +151,7 @@ pub fn random_poly() -> RusticResult<u64> {
  return Ok(poly);
  }
  }
- Err(PolynomialErrorKind::NoSuitablePolynomialFound)
+ Err(RusticErrorKind::PolynomialError(PolynomialErrorKind::NoSuitablePolynomialFound).into())
 }
 
 pub trait PolynomExtend {

diff --git a/crates/rustic_core/src/id.rs b/crates/rustic_core/src/id.rs
@@ -2,7 +2,7 @@ use std::fmt;
 use std::ops::Deref;
 use std::path::Path;
 
-use crate::{error::IdErrorKind, RusticResult};
+use crate::{error::IdErrorKind, RusticErrorKind, RusticResult};
 use binrw::{BinRead, BinWrite};
 use derive_more::{Constructor, Display};
 use rand::{thread_rng, RngCore};
@@ -39,7 +39,8 @@ impl Id {
  pub fn from_hex(s: &str) -> RusticResult<Self> {
  let mut id = Self::default();
 
- hex::decode_to_slice(s, &mut id.0).map_err(IdErrorKind::HexError)?;
+ hex::decode_to_slice(s, &mut id.0)
+ .map_err(|err| RusticErrorKind::IdError(IdErrorKind::HexError(err)))?;
 
  Ok(id)
  }