From 0d2896519cf8dae97da024912d93c37b3c3bba85 Mon Sep 17 00:00:00 2001
From: Vincent Ambo <mail@tazj.in>
Date: Mon, 8 Aug 2022 16:38:11 +0300
Subject: refactor(tvix/eval): move NumberPair struct definition to vm module

This isn't relevant to the value type itself.

Change-Id: I678bc92a8a530b1081ed498bf3ff7925217bcc01
Reviewed-on: https://cl.tvl.fyi/c/depot/+/6081
Tested-by: BuildkiteCI
Autosubmit: tazjin <tazjin@tvl.su>
Reviewed-by: grfn <grfn@gws.fyi>
---
 tvix/eval/src/eval.rs  | 2 +-
 tvix/eval/src/value.rs | 6 ------
 tvix/eval/src/vm.rs    | 8 +++++++-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/tvix/eval/src/eval.rs b/tvix/eval/src/eval.rs
index efa016ca98..9d3f993ba2 100644
--- a/tvix/eval/src/eval.rs
+++ b/tvix/eval/src/eval.rs
@@ -1,7 +1,7 @@
 use rnix::{self, types::TypedNode};
 use std::fmt::Write;
 
-use crate::errors::{Error, EvalResult};
+use crate::errors::EvalResult;
 
 pub fn interpret(code: String) -> EvalResult<String> {
     let ast = rnix::parse(&code);
diff --git a/tvix/eval/src/value.rs b/tvix/eval/src/value.rs
index 842d561d67..699c7de7bc 100644
--- a/tvix/eval/src/value.rs
+++ b/tvix/eval/src/value.rs
@@ -39,9 +39,3 @@ impl Value {
         }
     }
 }
-
-#[derive(Clone, Copy, Debug, PartialEq)]
-pub enum NumberPair {
-    Floats(f64, f64),
-    Integer(i64, i64),
-}
diff --git a/tvix/eval/src/vm.rs b/tvix/eval/src/vm.rs
index 7b7834c650..6841ac4706 100644
--- a/tvix/eval/src/vm.rs
+++ b/tvix/eval/src/vm.rs
@@ -5,7 +5,7 @@ use crate::{
     chunk::Chunk,
     errors::{Error, EvalResult},
     opcode::OpCode,
-    value::{NumberPair, Value},
+    value::Value,
 };
 
 pub struct VM {
@@ -123,6 +123,12 @@ impl VM {
     }
 }
 
+#[derive(Clone, Copy, Debug, PartialEq)]
+pub enum NumberPair {
+    Floats(f64, f64),
+    Integer(i64, i64),
+}
+
 pub fn run_chunk(chunk: Chunk) -> EvalResult<Value> {
     let mut vm = VM {
         chunk,
-- 
cgit 1.4.1