diff options
| -rw-r--r-- | tvix/nix-compat/src/nar/reader/mod.rs | 4 | ||||
| -rw-r--r-- | tvix/store/src/nar/import.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tvix/nix-compat/src/nar/reader/mod.rs b/tvix/nix-compat/src/nar/reader/mod.rs index 09af41866508..4958a67de304 100644 --- a/tvix/nix-compat/src/nar/reader/mod.rs +++ b/tvix/nix-compat/src/nar/reader/mod.rs @@ -5,7 +5,7 @@ //! and transferring store paths between Nix stores. use std::io::{ - self, + self, BufRead, ErrorKind::{InvalidData, UnexpectedEof}, Read, }; @@ -17,7 +17,7 @@ mod read; #[cfg(test)] mod test; -pub type Reader<'a> = dyn Read + Send + 'a; +pub type Reader<'a> = dyn BufRead + Send + 'a; /// Start reading a NAR file from `reader`. pub fn open<'a, 'r>(reader: &'a mut Reader<'r>) -> io::Result<Node<'a, 'r>> { diff --git a/tvix/store/src/nar/import.rs b/tvix/store/src/nar/import.rs index a9a9cc12d8e1..000fc05663b2 100644 --- a/tvix/store/src/nar/import.rs +++ b/tvix/store/src/nar/import.rs @@ -1,5 +1,5 @@ use std::{ - io::{self, Read}, + io::{self, BufRead}, sync::Arc, }; @@ -21,7 +21,7 @@ use tvix_castore::{ /// This function is not async (because the NAR reader is not) /// and calls [tokio::task::block_in_place] when interacting with backing /// services, so make sure to only call this with spawn_blocking. -pub fn read_nar<R: Read + Send>( +pub fn read_nar<R: BufRead + Send>( r: &mut R, blob_service: Arc<dyn BlobService>, directory_service: Arc<dyn DirectoryService>, |