mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(tvix/eval): add warning for deprecated URL literals

Browse source 
Change-Id: I8a9cfcb5d99680344ee0e3461a4a52526b846c92
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6175
Tested-by: BuildkiteCI
Reviewed-by: grfn <grfn@gws.fyi>
Reviewed-by: sterni <sternenseemann@systemli.org>
This commit is contained in:
Vincent Ambo 2022-08-12 17:13:41 +03:00 committed by tazjin
parent 7e77972d71
commit 598c197422
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
tvix/eval/src/compiler.rs
View file

@ -17,7 +17,7 @@ use crate::chunk::Chunk;
use crate::errors::EvalResult;
use crate::opcode::{CodeIdx, OpCode};
use crate::value::Value;
use crate::warnings::EvalWarning;
use crate::warnings::{EvalWarning, WarningKind};
use rnix;
use rnix::types::{BinOpKind, EntryHolder, TokenWrapper, TypedNode, Wrapper};
@ -46,7 +46,7 @@ impl Compiler {
// literal itself.
rnix::SyntaxKind::NODE_LITERAL => {
let value = rnix::types::Value::cast(node).unwrap();
self.compile_literal(value.to_value().expect("TODO"))
self.compile_literal(value)
}
rnix::SyntaxKind::NODE_STRING => {
@ -128,8 +128,8 @@ impl Compiler {
self.compile(node)
}
fn compile_literal(&mut self, value: rnix::value::Value) -> EvalResult<()> {
match value {
fn compile_literal(&mut self, node: rnix::types::Value) -> EvalResult<()> {
match node.to_value().unwrap() {
rnix::NixValue::Float(f) => {
let idx = self.chunk.add_constant(Value::Float(f));
self.chunk.add_op(OpCode::OpConstant(idx));
@ -144,7 +144,11 @@ impl Compiler {
// These nodes are yielded by literal URL values.
rnix::NixValue::String(s) => {
// TODO(tazjin): emit deprecation warning
self.warnings.push(EvalWarning {
node: node.node().clone(),
kind: WarningKind::DeprecatedLiteralURL,
});
let idx = self.chunk.add_constant(Value::String(s.into()));
self.chunk.add_op(OpCode::OpConstant(idx));
Ok(())

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

@ -2,7 +2,9 @@
/// problems that the user could address.
#[derive(Debug)]
pub enum WarningKind {}
pub enum WarningKind {
DeprecatedLiteralURL,
}
#[derive(Debug)]
pub struct EvalWarning {