From 260c2938d4ef038993fbd0c84a7ec220ef3f78f2 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Thu, 29 Feb 2024 10:31:14 +0200
Subject: refactor(tvix/nix-compat): rename NixHash::{digest,hash}

This doesn't return the digest, but the internal NixHash.

To get the digest, you use `ca_hash.hash().digest_as_bytes()`
(as done in tvix/nix-compat/src/derivation/write.rs).

Change-Id: Ib07918dec63ae42ddf8c8d3f1d10510f9c4df255
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11070
Reviewed-by: tazjin <tazjin@tvl.su>
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
---
 tvix/nix-compat/src/derivation/mod.rs   | 2 +-
 tvix/nix-compat/src/derivation/write.rs | 4 ++--
 tvix/nix-compat/src/nixhash/ca_hash.rs  | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'tvix/nix-compat/src')

diff --git a/tvix/nix-compat/src/derivation/mod.rs b/tvix/nix-compat/src/derivation/mod.rs
index 7c5afdbdcf2b..848f1a31ff36 100644
--- a/tvix/nix-compat/src/derivation/mod.rs
+++ b/tvix/nix-compat/src/derivation/mod.rs
@@ -160,7 +160,7 @@ impl Derivation {
             Sha256::new_with_prefix(format!(
                 "fixed:out:{}{}:{}",
                 ca_kind_prefix(ca_hash),
-                ca_hash.digest().to_nix_hex_string(),
+                ca_hash.hash().to_nix_hex_string(),
                 out_output
                     .path
                     .as_ref()
diff --git a/tvix/nix-compat/src/derivation/write.rs b/tvix/nix-compat/src/derivation/write.rs
index a603c7a19d4e..f20bf4e121d2 100644
--- a/tvix/nix-compat/src/derivation/write.rs
+++ b/tvix/nix-compat/src/derivation/write.rs
@@ -137,8 +137,8 @@ pub(crate) fn write_outputs(
 
         let (mode_and_algo, digest) = match &output.ca_hash {
             Some(ca_hash) => (
-                format!("{}{}", ca_kind_prefix(ca_hash), ca_hash.digest().algo()),
-                data_encoding::HEXLOWER.encode(ca_hash.digest().digest_as_bytes()),
+                format!("{}{}", ca_kind_prefix(ca_hash), ca_hash.hash().algo()),
+                data_encoding::HEXLOWER.encode(ca_hash.hash().digest_as_bytes()),
             ),
             None => ("".to_string(), "".to_string()),
         };
diff --git a/tvix/nix-compat/src/nixhash/ca_hash.rs b/tvix/nix-compat/src/nixhash/ca_hash.rs
index 0d6c68d7fa7f..d69d19ce68f3 100644
--- a/tvix/nix-compat/src/nixhash/ca_hash.rs
+++ b/tvix/nix-compat/src/nixhash/ca_hash.rs
@@ -23,7 +23,7 @@ pub enum CAHash {
 }
 
 impl CAHash {
-    pub fn digest(&self) -> Cow<NixHash> {
+    pub fn hash(&self) -> Cow<NixHash> {
         match *self {
             CAHash::Flat(ref digest) => Cow::Borrowed(digest),
             CAHash::Nar(ref digest) => Cow::Borrowed(digest),
-- 
cgit 1.4.1