mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(tvix/castore/import): rename ingest_entries function arg

Browse source 
This is a stream of DirEntry, so let's call it direntry_stream.

Change-Id: I5b3cb4efba899d746393f75f6ece7eaa79424717
Reviewed-on: https://cl.tvl.fyi/c/depot/+/11401
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
Autosubmit: flokli <flokli@flokli.de>
Tested-by: BuildkiteCI
This commit is contained in:
Florian Klink 2024-04-12 20:51:15 +03:00 committed by clbot
parent 820e98fa7f
commit cc42cac39c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tvix/castore/src/import.rs
View file

@ -302,7 +302,7 @@ impl MerkleInvariantChecker {
pub async fn ingest_entries<'a, BS, DS, S>( pub async fn ingest_entries<'a, BS, DS, S>(
blob_service: BS, blob_service: BS,
directory_service: DS, directory_service: DS,
mut entries_async_iterator: S, mut direntry_stream: S,
) -> Result<Node, Error> ) -> Result<Node, Error>
where where
BS: AsRef<dyn BlobService> + Clone, BS: AsRef<dyn BlobService> + Clone,
@ -319,7 +319,7 @@ where
// We need to process a directory's children before processing // We need to process a directory's children before processing
// the directory itself in order to have all the data needed // the directory itself in order to have all the data needed
// to compute the hash. // to compute the hash.
while let Some(entry) = entries_async_iterator.next().await { while let Some(entry) = direntry_stream.next().await {
#[cfg(debug_assertions)] #[cfg(debug_assertions)]
{ {
// If we find an ancestor before we see this entry, this means that the caller // If we find an ancestor before we see this entry, this means that the caller