Skip to content

Commit b392a55

Browse files
committed
[git-pack] compilation
1 parent bd77c80 commit b392a55

File tree

2 files changed

+10
-11
lines changed

2 files changed

+10
-11
lines changed

git-odb/src/store/loose/backend/find.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
use crate::store::loose::{backend::sha1_path, Backend, HEADER_READ_UNCOMPRESSED_BYTES};
22
use git_features::zlib;
3-
use git_pack::data;
4-
use git_pack::loose::object::header;
3+
use git_pack::{data, loose::object::header};
54
use std::{convert::TryInto, fs, io::Read, path::PathBuf};
65

76
/// Returned by [`Backend::find()`]

gitoxide-core/src/pack/explode.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ use anyhow::{anyhow, Result};
44
use quick_error::quick_error;
55

66
use git_features::progress::{self, Progress};
7-
use git_odb::{pack, store::loose, Write};
7+
use git_odb::{store::loose, Write};
88

99
#[derive(PartialEq, Debug)]
1010
pub enum SafetyCheck {
@@ -47,7 +47,7 @@ impl std::str::FromStr for SafetyCheck {
4747
}
4848
}
4949

50-
impl From<SafetyCheck> for pack::index::traverse::SafetyCheck {
50+
impl From<SafetyCheck> for git_pack::index::traverse::SafetyCheck {
5151
fn from(v: SafetyCheck) -> Self {
5252
use git_pack::index::traverse::SafetyCheck::*;
5353
match v {
@@ -78,7 +78,7 @@ quick_error! {
7878
display("Failed to write {} object {}", kind, id)
7979
source(&**err)
8080
}
81-
Verify(err: git_odb::data::verify::Error) {
81+
Verify(err: git_pack::data::object::verify::Error) {
8282
display("Object didn't verify after right after writing it")
8383
source(err)
8484
from()
@@ -163,7 +163,7 @@ pub fn pack_or_pack_index(
163163
use anyhow::Context;
164164

165165
let path = pack_path.as_ref();
166-
let bundle = pack::Bundle::at(path).with_context(|| {
166+
let bundle = git_pack::Bundle::at(path).with_context(|| {
167167
format!(
168168
"Could not find .idx or .pack file from given file at '{}'",
169169
path.display()
@@ -182,12 +182,12 @@ pub fn pack_or_pack_index(
182182

183183
let algorithm = object_path
184184
.as_ref()
185-
.map(|_| pack::index::traverse::Algorithm::Lookup)
185+
.map(|_| git_pack::index::traverse::Algorithm::Lookup)
186186
.unwrap_or_else(|| {
187187
if sink_compress {
188-
pack::index::traverse::Algorithm::Lookup
188+
git_pack::index::traverse::Algorithm::Lookup
189189
} else {
190-
pack::index::traverse::Algorithm::DeltaTreeLookup
190+
git_pack::index::traverse::Algorithm::DeltaTreeLookup
191191
}
192192
});
193193
let mut progress = bundle.index.traverse(
@@ -224,8 +224,8 @@ pub fn pack_or_pack_index(
224224
}
225225
}
226226
},
227-
pack::cache::lru::StaticLinkedList::<64>::default,
228-
pack::index::traverse::Options {
227+
git_pack::cache::lru::StaticLinkedList::<64>::default,
228+
git_pack::index::traverse::Options {
229229
algorithm,
230230
thread_limit,
231231
check: check.into(),

0 commit comments

Comments
 (0)