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

feat(tvix/eval): allow to disable warnings

Browse source 
The nix_tests test suite produces lots of warnings.  We can't fix
these, since they are kept in sync with upstream, so there's little
point in cluttering up the console with them every time the tests
are run.

Let's add a clap flag "warnings" and TVIX_WARNINGS environment
variable.  The default is "true".  The test runner overrides this
default and mutes the warnings.

Signed-off-by: Adam Joseph <adam@westernsemico.com>
Change-Id: I4b065f96fe15838afcca6970491a54e248ae4df7
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6985
Reviewed-by: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
Tested-by: BuildkiteCI
This commit is contained in:
Adam Joseph 2022-10-11 23:18:25 -07:00
parent 7c99e9e8e3
commit e83609a061
2 changed files with 28 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

30
tvix/eval/src/eval.rs
View file

@ -25,11 +25,28 @@ pub struct Options {
#[cfg_attr(feature = "repl", clap(long, env = "TVIX_TRACE_RUNTIME"))]
trace_runtime: bool,
/// Print warnings
#[cfg_attr(
feature = "repl",
clap(long, env = "TVIX_WARNINGS", default_value = "true")
)]
warnings: bool,
/// A colon-separated list of directories to use to resolve `<...>`-style paths
#[cfg_attr(feature = "repl", clap(long, short = 'I', env = "NIX_PATH"))]
nix_search_path: Option<NixSearchPath>,
}
impl Options {
#[cfg(test)]
pub(crate) fn test_options() -> Options {
Options {
warnings: false,
..Options::default()
}
}
}
pub fn interpret(code: &str, location: Option<PathBuf>, options: Options) -> EvalResult<Value> {
let source = SourceCode::new();
let file = source.add_file(
@ -97,8 +114,10 @@ pub fn interpret(code: &str, location: Option<PathBuf>, options: Options) -> Eva
)
}?;
for warning in result.warnings {
warning.fancy_format_stderr(&source);
if options.warnings {
for warning in result.warnings {
warning.fancy_format_stderr(&source);
}
}
for error in &result.errors {
@ -128,10 +147,11 @@ pub fn interpret(code: &str, location: Option<PathBuf>, options: Options) -> Eva
}
result.map(|r| {
for warning in r.warnings {
warning.fancy_format_stderr(&source);
if options.warnings {
for warning in r.warnings {
warning.fancy_format_stderr(&source);
}
}
r.value
})
}