History

refactor

Sebastian Thiel committed 6 years ago

Commit 7bc321e1 parent 69f79302 files · +10 −22Browse files

Unified · Split

2 files
  1. git-odb/src/loose/db/iter.rs +4 −8
  2. git-odb/src/zlib/stream/deflate.rs +6 −14
git-odb/src/loose/db/iter.rs+4−8
@@ -1,15 +1,11 @@
1use crate::loose::Db;1use crate::loose::Db;
2use git_object::owned;2use git_object::owned;
3use quick_error::quick_error;
4use walkdir::WalkDir;3use walkdir::WalkDir;
5 4
6quick_error! {5#[derive(thiserror::Error, Debug)]
7 #[derive(Debug)]6pub enum Error {
8 pub enum Error {7 #[error(transparent)]
9 WalkDir(err: walkdir::Error) {8 WalkDir(#[from] walkdir::Error),
10 source(err)
11 }
12 }
13}9}
14 10
15/// Iteration and traversal11/// Iteration and traversal
git-odb/src/zlib/stream/deflate.rs+6−14
@@ -1,21 +1,13 @@
1use super::Status;1use super::Status;
2use miniz_oxide::{deflate, deflate::core::CompressorOxide, MZError, MZFlush, MZStatus};2use miniz_oxide::{deflate, deflate::core::CompressorOxide, MZError, MZFlush, MZStatus};
3use quick_error::quick_error;
4use std::io;3use std::io;
5 4
6quick_error! {5#[derive(thiserror::Error, Debug)]
7 #[derive(Debug)]6pub enum Error {
8 pub enum Error {7 #[error("Need dictionary")]
9 Compression {8 ZLibNeedDict,
10 display("The compression failed due to an unknown error")9 #[error("A compression error occurred: {0:?}")]
11 }10 Error(MZError),
12 ZLibNeedDict {
13 display("Need dictionary")
14 }
15 Error(err: MZError) {
16 display("A compression error occurred: {:?}", err)
17 }
18 }
19}11}
20 12
21pub struct Deflate {13pub struct Deflate {