maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): Implement builtins.readFileType

Browse source 
builtins.readFileType was added to Nix back in version 2.14.

The tests were also moved out of notyetpassing in addition to the
readDir fixtures they depend on.

I caught a bug where we previously used std::fs::metadata (via the
.metadata() method on File) which follows symlinks so it would always
return false for is_symlink(). Instead we now use
std::fs::symlink_metadata directly which does not follow symlinks, so
tests now pass. This wasn't an issue for builtins.readDir as it uses
walkdir and walkdir doesn't follow symlinks either.

Change-Id: I58eb97bdb5ec95df4f6882f495f8c572fe7c6793
Reviewed-on: https://cl.tvl.fyi/c/depot/+/12130
Reviewed-by: flokli <flokli@flokli.de>
Autosubmit: Ilan Joselevich <personal@ilanjoselevich.com>
Tested-by: BuildkiteCI
This commit is contained in:
Ilan Joselevich 2024-08-04 01:00:25 +03:00
parent 9c4b57ac63
commit 3511e328ec
10 changed files with 47 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tvix/eval/src/io.rs
View file

@ -26,7 +26,7 @@ use std::os::unix::ffi::OsStringExt;
#[cfg(feature = "impure")]
use std::fs::File;
/// Types of files as represented by `builtins.readDir` in Nix.
/// Types of files as represented by `builtins.readFileType` and `builtins.readDir` in Nix.
#[derive(Debug)]
pub enum FileType {
Directory,
@ -120,7 +120,7 @@ impl EvalIO for StdIO {
}
fn file_type(&self, path: &Path) -> io::Result<FileType> {
let file_type = File::open(path)?.metadata()?.file_type();
let file_type = std::fs::symlink_metadata(path)?;
Ok(if file_type.is_dir() {
FileType::Directory