diff options
| author | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-08-03T22·00+0300 |
|---|---|---|
| committer | Ilan Joselevich <personal@ilanjoselevich.com> | 2024-08-09T14·35+0000 |
| commit | 3511e328ec67c0481c1412675c1b47025486d453 (patch) | |
| tree | 675dfce09263441e6cf2e673067ca0792fc3016a /tvix/eval/src/io.rs | |
| parent | 9c4b57ac6330da5c6aa795778dd7e0e6c0721d67 (diff) | |
feat(tvix/eval): Implement builtins.readFileType r/8466
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
Diffstat (limited to 'tvix/eval/src/io.rs')
| -rw-r--r-- | tvix/eval/src/io.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tvix/eval/src/io.rs b/tvix/eval/src/io.rs index e4bad7b11ce0..7e8b85c87abb 100644 --- a/tvix/eval/src/io.rs +++ b/tvix/eval/src/io.rs @@ -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 |