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

refactor(tvix/eval): print only *types* when observing generators

Browse source 
Do not print the entire value (they're likely to be thunks anyways).
This is useful because there *can* be cases where something like
`nixpkgs` itself is sent through one of these messages, in which case
the observer trying to print it will just blow up.

Change-Id: I1fa37ea071d75efa0eb3428c6e2fe4351c62be6b
Reviewed-on: https://cl.tvl.fyi/c/depot/+/8202
Tested-by: BuildkiteCI
Reviewed-by: raitobezarius <tvl@lahfa.xyz>
This commit is contained in:
Vincent Ambo 2023-03-03 22:54:32 +03:00 • committed by tazjin
parent d9371c2f6f
commit 54a12577c4
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
tvix/eval/src/vm/generators.rs
View file

@ -120,22 +120,26 @@ pub enum GeneratorRequest {
impl Display for GeneratorRequest { impl Display for GeneratorRequest {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
match self { match self {
GeneratorRequest::ForceValue(v) => write!(f, "force_value({})", v), GeneratorRequest::ForceValue(v) => write!(f, "force_value({})", v.type_of()),
GeneratorRequest::DeepForceValue(v, _) => write!(f, "deep_force_value({})", v), GeneratorRequest::DeepForceValue(v, _) => {
write!(f, "deep_force_value({})", v.type_of())
}
GeneratorRequest::WithValue(_) => write!(f, "with_value"), GeneratorRequest::WithValue(_) => write!(f, "with_value"),
GeneratorRequest::CapturedWithValue(_) => write!(f, "captured_with_value"), GeneratorRequest::CapturedWithValue(_) => write!(f, "captured_with_value"),
GeneratorRequest::NixEquality(values, ptr_eq) => { GeneratorRequest::NixEquality(values, ptr_eq) => {
write!( write!(
f, f,
"nix_eq({}, {}, PointerEquality::{:?})", "nix_eq({}, {}, PointerEquality::{:?})",
values.0, values.1, ptr_eq values.0.type_of(),
values.1.type_of(),
ptr_eq
) )
} }
GeneratorRequest::StackPush(v) => write!(f, "stack_push({})", v), GeneratorRequest::StackPush(v) => write!(f, "stack_push({})", v.type_of()),
GeneratorRequest::StackPop => write!(f, "stack_pop"), GeneratorRequest::StackPop => write!(f, "stack_pop"),
GeneratorRequest::StringCoerce(v, kind) => match kind { GeneratorRequest::StringCoerce(v, kind) => match kind {
CoercionKind::Weak => write!(f, "weak_string_coerce({})", v), CoercionKind::Weak => write!(f, "weak_string_coerce({})", v.type_of()),
CoercionKind::Strong => write!(f, "strong_string_coerce({})", v), CoercionKind::Strong => write!(f, "strong_string_coerce({})", v.type_of()),
}, },
GeneratorRequest::Call(v) => write!(f, "call({})", v), GeneratorRequest::Call(v) => write!(f, "call({})", v),
GeneratorRequest::EnterLambda { lambda, .. } => { GeneratorRequest::EnterLambda { lambda, .. } => {
@ -155,7 +159,7 @@ impl Display for GeneratorRequest {
GeneratorRequest::PathExists(p) => write!(f, "path_exists({})", p.to_string_lossy()), GeneratorRequest::PathExists(p) => write!(f, "path_exists({})", p.to_string_lossy()),
GeneratorRequest::ReadDir(p) => write!(f, "read_dir({})", p.to_string_lossy()), GeneratorRequest::ReadDir(p) => write!(f, "read_dir({})", p.to_string_lossy()),
GeneratorRequest::Span => write!(f, "span"), GeneratorRequest::Span => write!(f, "span"),
GeneratorRequest::TryForce(v) => write!(f, "try_force({})", v), GeneratorRequest::TryForce(v) => write!(f, "try_force({})", v.type_of()),
} }
} }
} }