Skip to content

Commit 3d7e379

Browse files
emilazyemilazy
committed
migrate gix_object::{try_ =>}compute_hash users
Trivial rename.
1 parent b5ac93a commit 3d7e379

File tree

14 files changed

+21
-23
lines changed

14 files changed

+21
-23
lines changed

‎gix-diff/tests/diff/main.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ mod util {
5252
impl ObjectDb {
5353
/// Insert `data` and return its hash. That can be used to find it again.
5454
pub fn insert(&mut self, data: &str) -> Result<gix_hash::ObjectId, Error> {
55-
let id = gix_object::try_compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Blob, data.as_bytes())?;
55+
let id = gix_object::compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Blob, data.as_bytes())?;
5656
self.data_by_id.insert(id, data.into());
5757
Ok(id)
5858
}

‎gix-filter/src/ident.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ pub fn apply(src: &[u8], object_hash: gix_hash::Kind, buf: &mut Vec<u8>) -> Resu
6868
while let Some(pos) = src[ofs..].find(b"$Id$") {
6969
let id = match id {
7070
None => {
71-
let new_id = gix_object::try_compute_hash(object_hash, gix_object::Kind::Blob, src)?;
71+
let new_id = gix_object::compute_hash(object_hash, gix_object::Kind::Blob, src)?;
7272
id = new_id.into();
7373
clear_and_set_capacity(buf, src.len() + HASH_LEN)?; // pre-allocate for one ID
7474
new_id

‎gix-merge/tests/merge/blob/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ mod util {
4444
impl ObjectDb {
4545
/// Insert `data` and return its hash. That can be used to find it again.
4646
pub fn insert(&mut self, data: &str) -> Result<gix_hash::ObjectId, Error> {
47-
let id = gix_object::try_compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Blob, data.as_bytes())?;
47+
let id = gix_object::compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Blob, data.as_bytes())?;
4848
self.data_by_id.insert(id, data.into());
4949
Ok(id)
5050
}

‎gix-object/benches/edit_tree.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ fn new_inmemory_writes() -> (
147147
move |tree: &Tree| {
148148
buf.clear();
149149
tree.write_to(&mut buf)?;
150-
let id = gix_object::try_compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Tree, &buf)?;
150+
let id = gix_object::compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Tree, &buf)?;
151151
let mut borrowed = store.borrow_mut();
152152
match borrowed.entry(id) {
153153
Entry::Occupied(_) => {}

‎gix-object/src/data.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub mod verify {
6666
/// If the hashes do not match, an [`Error`] is returned, containing the actual
6767
/// hash of `self`.
6868
pub fn verify_checksum(&self, expected: &gix_hash::oid) -> Result<gix_hash::ObjectId, Error> {
69-
let actual = crate::try_compute_hash(expected.kind(), self.kind, self.data)?;
69+
let actual = crate::compute_hash(expected.kind(), self.kind, self.data)?;
7070
actual.verify(expected)?;
7171
Ok(actual)
7272
}

‎gix-object/tests/object/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ mod tree;
1212
fn compute_hash() {
1313
let hk = gix_hash::Kind::Sha1;
1414
assert_eq!(
15-
gix_object::try_compute_hash(hk, gix_object::Kind::Blob, &[]).expect("empty hash doesn’t collide"),
15+
gix_object::compute_hash(hk, gix_object::Kind::Blob, &[]).expect("empty hash doesn’t collide"),
1616
gix_hash::ObjectId::empty_blob(hk)
1717
);
1818
assert_eq!(
19-
gix_object::try_compute_hash(hk, gix_object::Kind::Tree, &[]).expect("empty hash doesn’t collide"),
19+
gix_object::compute_hash(hk, gix_object::Kind::Tree, &[]).expect("empty hash doesn’t collide"),
2020
gix_hash::ObjectId::empty_tree(hk)
2121
);
2222
}

‎gix-object/tests/object/tree/editor.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -805,7 +805,7 @@ mod utils {
805805
move |tree: &Tree| {
806806
buf.clear();
807807
tree.write_to(&mut buf)?;
808-
let id = gix_object::try_compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Tree, &buf)?;
808+
let id = gix_object::compute_hash(gix_hash::Kind::Sha1, gix_object::Kind::Tree, &buf)?;
809809
store.borrow_mut().insert(id, tree.clone());
810810
let old = num_writes.get();
811811
num_writes.set(old + 1);

‎gix-odb/src/memory.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ where
219219
let mut buf = Vec::new();
220220
from.read_to_end(&mut buf)?;
221221

222-
let id = gix_object::try_compute_hash(self.object_hash, kind, &buf)?;
222+
let id = gix_object::compute_hash(self.object_hash, kind, &buf)?;
223223
map.borrow_mut().insert(id, (kind, buf));
224224
Ok(id)
225225
}

‎gix-pack/src/index/write/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ fn modify_base(
258258
hash: gix_hash::Kind,
259259
) -> Result<(), hasher::Error> {
260260
let object_kind = pack_entry.header.as_kind().expect("base object as source of iteration");
261-
let id = gix_object::try_compute_hash(hash, object_kind, decompressed)?;
261+
let id = gix_object::compute_hash(hash, object_kind, decompressed)?;
262262
entry.id = id;
263263
Ok(())
264264
}

‎gix-status/src/index_as_worktree/traits.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,15 +143,15 @@ impl CompareBlobs for HashEq {
143143
let mut stream = data.stream_worktree_file()?;
144144
match stream.as_bytes() {
145145
Some(buffer) => {
146-
let file_hash = gix_object::try_compute_hash(entry.id.kind(), gix_object::Kind::Blob, buffer)
146+
let file_hash = gix_object::compute_hash(entry.id.kind(), gix_object::Kind::Blob, buffer)
147147
.map_err(hasher::io::Error::from)?;
148148
Ok((entry.id != file_hash).then_some(file_hash))
149149
}
150150
None => {
151151
let file_hash = match stream.size() {
152152
None => {
153153
stream.read_to_end(buf).map_err(hasher::io::Error::from)?;
154-
gix_object::try_compute_hash(entry.id.kind(), gix_object::Kind::Blob, buf)
154+
gix_object::compute_hash(entry.id.kind(), gix_object::Kind::Blob, buf)
155155
.map_err(hasher::io::Error::from)?
156156
}
157157
Some(len) => gix_object::compute_stream_hash(

‎gix-status/src/index_as_worktree_with_renames/mod.rs

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -536,22 +536,20 @@ pub(super) mod function {
536536
should_interrupt,
537537
)
538538
.map_err(Error::HashFile)?,
539-
ToGitOutcome::Buffer(buf) => {
540-
gix_object::try_compute_hash(object_hash, gix_object::Kind::Blob, buf)
541-
.map_err(|err| Error::HashFile(err.into()))?
542-
}
539+
ToGitOutcome::Buffer(buf) => gix_object::compute_hash(object_hash, gix_object::Kind::Blob, buf)
540+
.map_err(|err| Error::HashFile(err.into()))?,
543541
ToGitOutcome::Process(mut stream) => {
544542
buf.clear();
545543
stream.read_to_end(buf).map_err(|err| Error::HashFile(err.into()))?;
546-
gix_object::try_compute_hash(object_hash, gix_object::Kind::Blob, buf)
544+
gix_object::compute_hash(object_hash, gix_object::Kind::Blob, buf)
547545
.map_err(|err| Error::HashFile(err.into()))?
548546
}
549547
}
550548
}
551549
Kind::Symlink => {
552550
let path = worktree_root.join(gix_path::from_bstr(rela_path));
553551
let target = gix_path::into_bstr(std::fs::read_link(path).map_err(Error::ReadLink)?);
554-
gix_object::try_compute_hash(object_hash, gix_object::Kind::Blob, &target)
552+
gix_object::compute_hash(object_hash, gix_object::Kind::Blob, &target)
555553
.map_err(|err| Error::HashFile(err.into()))?
556554
}
557555
Kind::Directory | Kind::Repository => object_hash.null(),

‎gix/src/repository/impls.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ impl gix_object::Write for crate::Repository {
106106
}
107107

108108
fn write_buf(&self, object: gix_object::Kind, from: &[u8]) -> Result<gix_hash::ObjectId, gix_object::write::Error> {
109-
let oid = gix_object::try_compute_hash(self.object_hash(), object, from)?;
109+
let oid = gix_object::compute_hash(self.object_hash(), object, from)?;
110110
if self.objects.exists(&oid) {
111111
return Ok(oid);
112112
}

‎gix/src/repository/object.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ impl crate::Repository {
172172
}
173173

174174
fn write_object_inner(&self, buf: &[u8], kind: gix_object::Kind) -> Result<Id<'_>, object::write::Error> {
175-
let oid = gix_object::try_compute_hash(self.object_hash(), kind, buf)
175+
let oid = gix_object::compute_hash(self.object_hash(), kind, buf)
176176
.map_err(|err| Box::new(err) as Box<dyn std::error::Error + Send + Sync>)?;
177177
if self.objects.exists(&oid) {
178178
return Ok(oid.attach(self));
@@ -190,7 +190,7 @@ impl crate::Repository {
190190
/// pre-hashing the data, and checking if the object is already present.
191191
pub fn write_blob(&self, bytes: impl AsRef<[u8]>) -> Result<Id<'_>, object::write::Error> {
192192
let bytes = bytes.as_ref();
193-
let oid = gix_object::try_compute_hash(self.object_hash(), gix_object::Kind::Blob, bytes)
193+
let oid = gix_object::compute_hash(self.object_hash(), gix_object::Kind::Blob, bytes)
194194
.map_err(|err| Box::new(err) as Box<dyn std::error::Error + Send + Sync>)?;
195195
if self.objects.exists(&oid) {
196196
return Ok(oid.attach(self));
@@ -216,7 +216,7 @@ impl crate::Repository {
216216
}
217217

218218
fn write_blob_stream_inner(&self, buf: &[u8]) -> Result<Id<'_>, object::write::Error> {
219-
let oid = gix_object::try_compute_hash(self.object_hash(), gix_object::Kind::Blob, buf)
219+
let oid = gix_object::compute_hash(self.object_hash(), gix_object::Kind::Blob, buf)
220220
.map_err(|err| Box::new(err) as Box<dyn std::error::Error + Send + Sync>)?;
221221
if self.objects.exists(&oid) {
222222
return Ok(oid.attach(self));

‎tests/it/src/commands/git_to_sh.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ pub(super) mod function {
115115
})?;
116116
let mapped = crate::commands::copy_royal::remapped(data);
117117
(
118-
gix::objs::try_compute_hash(
118+
gix::objs::compute_hash(
119119
repo.object_hash(),
120120
gix::object::Kind::Blob,
121121
mapped.as_bytes(),

0 commit comments

Comments
 (0)