refactor(tvix/eval): use light spans in builtins.import r/5466

Change-Id: I05732073155b430575babb6f076bf465aef98857
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7581
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>

1 files changed, 2 insertions, 6 deletions

diff --git a/tvix/eval/src/builtins/impure.rs b/tvix/eval/src/builtins/impure.rs
index 904706dc65d9..d371d877977d 100644
--- a/tvix/eval/src/builtins/impure.rs
+++ b/tvix/eval/src/builtins/impure.rs
@@ -13,7 +13,6 @@ use crate::{
     errors::ErrorKind,
     io::FileType,
     observer::NoOpObserver,
-    spans::LightSpan,
     value::{Builtin, BuiltinArgument, NixAttrs, Thunk},
     vm::VM,
     SourceCode, Value,
@@ -123,7 +122,7 @@ pub fn builtins_import(globals: &Weak<GlobalsMap>, source: SourceCode) -> Builti
                 path.push("default.nix");
             }
 
-            let current_span = vm.current_span();
+            let current_span = vm.current_light_span();
 
             if let Some(cached) = vm.import_cache.get(&path) {
                 return Ok(cached.clone());
@@ -172,10 +171,7 @@ pub fn builtins_import(globals: &Weak<GlobalsMap>, source: SourceCode) -> Builti
 
             // Compilation succeeded, we can construct a thunk from whatever it spat
             // out and return that.
-            let res = Value::Thunk(Thunk::new_suspended(
-                result.lambda,
-                LightSpan::new_actual(current_span),
-            ));
+            let res = Value::Thunk(Thunk::new_suspended(result.lambda, current_span));
 
             vm.import_cache.insert(path, res.clone());