move StmtCompiled to stmt.rs

Summary: It is better for it to live there.

Reviewed By: ndmitchell

Differential Revision: D30888375

fbshipit-source-id: 484fdf0fe02b37f7eba6bd828d37ebb71c10b3c5

Author: stepancheg

starlark/src/eval/compiler/mod.rs

@@ -30,89 +30,7 @@ use crate::{
 use anyhow::anyhow;
 use gazebo::prelude::*;
 use once_cell::sync::Lazy;
-use std::{fmt::Debug, mem};
-
-pub(crate) type StmtCompiled =
-    Box<dyn for<'v> Fn(&mut Evaluator<'v, '_>) -> Result<(), EvalException<'v>> + Send + Sync>;
-
-enum SmallVec1<T> {
-    Empty,
-    One(T),
-    Many(Vec<T>),
-}
-
-impl<T> SmallVec1<T> {
-    fn extend(&mut self, stmts: SmallVec1<T>) {
-        *self = match (mem::replace(self, SmallVec1::Empty), stmts) {
-            (SmallVec1::Empty, right) => right,
-            (left, SmallVec1::Empty) => left,
-            (SmallVec1::One(left), SmallVec1::One(right)) => SmallVec1::Many(vec![left, right]),
-            (SmallVec1::One(left), SmallVec1::Many(mut right)) => {
-                right.insert(0, left);
-                SmallVec1::Many(right)
-            }
-            (SmallVec1::Many(mut left), SmallVec1::One(right)) => {
-                left.push(right);
-                SmallVec1::Many(left)
-            }
-            (SmallVec1::Many(mut left), SmallVec1::Many(right)) => {
-                left.extend(right);
-                SmallVec1::Many(left)
-            }
-        }
-    }
-}
-
-pub(crate) struct StmtsCompiled(SmallVec1<StmtCompiled>);
-
-impl StmtsCompiled {
-    pub(crate) fn empty() -> StmtsCompiled {
-        StmtsCompiled(SmallVec1::Empty)
-    }
-
-    pub(crate) fn one(stmt: StmtCompiled) -> StmtsCompiled {
-        StmtsCompiled(SmallVec1::One(stmt))
-    }
-
-    pub(crate) fn len(&self) -> usize {
-        match &self.0 {
-            SmallVec1::Empty => 0,
-            SmallVec1::One(_) => 1,
-            SmallVec1::Many(stmts) => stmts.len(),
-        }
-    }
-
-    pub(crate) fn is_empty(&self) -> bool {
-        match &self.0 {
-            SmallVec1::Empty => true,
-            SmallVec1::One(_) => false,
-            SmallVec1::Many(stmts) => {
-                debug_assert!(stmts.len() > 1);
-                false
-            }
-        }
-    }
-
-    pub(crate) fn extend(&mut self, right: StmtsCompiled) {
-        self.0.extend(right.0);
-    }
-
-    pub(crate) fn as_compiled(self) -> StmtCompiled {
-        match self.0 {
-            SmallVec1::Empty => box |_eval| Ok(()),
-            SmallVec1::One(stmt) => stmt,
-            SmallVec1::Many(vec) => {
-                debug_assert!(vec.len() > 1);
-                box move |eval| {
-                    for stmt in &vec {
-                        stmt(eval)?;
-                    }
-                    Ok(())
-                }
-            }
-        }
-    }
-}
+use std::fmt::Debug;
 
 #[derive(Debug)]
 pub(crate) enum EvalException<'v> {

starlark/src/eval/fragment/def.rs

@@ -26,9 +26,12 @@ use crate::{
             scope::{
                 Captured, CstAssignIdent, CstExpr, CstParameter, CstStmt, ScopeId, ScopeNames,
             },
-            throw_eval_exception, Compiler, EvalException, StmtCompiled,
+            throw_eval_exception, Compiler, EvalException,
+        },
+        fragment::{
+            expr::{ExprCompiled, ExprCompiledValue},
+            stmt::StmtCompiled,
         },
-        fragment::expr::{ExprCompiled, ExprCompiledValue},
         runtime::{
             arguments::{ParameterKind, ParametersSpec},
             evaluator::Evaluator,

starlark/src/eval/fragment/stmt.rs

@@ -29,7 +29,7 @@ use crate::{
         compiler::{
             expr_throw,
             scope::{Captured, CstAssign, CstExpr, CstStmt, Slot},
-            throw, Compiler, EvalException, ExprEvalException, StmtsCompiled,
+            throw, Compiler, EvalException, ExprEvalException,
         },
         fragment::{
             expr::{ExprCompiled, ExprCompiledValue},
@@ -45,6 +45,88 @@ use gazebo::prelude::*;
 use std::mem;
 use thiserror::Error;
 
+pub(crate) type StmtCompiled =
+    Box<dyn for<'v> Fn(&mut Evaluator<'v, '_>) -> Result<(), EvalException<'v>> + Send + Sync>;
+
+enum SmallVec1<T> {
+    Empty,
+    One(T),
+    Many(Vec<T>),
+}
+
+impl<T> SmallVec1<T> {
+    fn extend(&mut self, stmts: SmallVec1<T>) {
+        *self = match (mem::replace(self, SmallVec1::Empty), stmts) {
+            (SmallVec1::Empty, right) => right,
+            (left, SmallVec1::Empty) => left,
+            (SmallVec1::One(left), SmallVec1::One(right)) => SmallVec1::Many(vec![left, right]),
+            (SmallVec1::One(left), SmallVec1::Many(mut right)) => {
+                right.insert(0, left);
+                SmallVec1::Many(right)
+            }
+            (SmallVec1::Many(mut left), SmallVec1::One(right)) => {
+                left.push(right);
+                SmallVec1::Many(left)
+            }
+            (SmallVec1::Many(mut left), SmallVec1::Many(right)) => {
+                left.extend(right);
+                SmallVec1::Many(left)
+            }
+        }
+    }
+}
+
+pub(crate) struct StmtsCompiled(SmallVec1<StmtCompiled>);
+
+impl StmtsCompiled {
+    pub(crate) fn empty() -> StmtsCompiled {
+        StmtsCompiled(SmallVec1::Empty)
+    }
+
+    pub(crate) fn one(stmt: StmtCompiled) -> StmtsCompiled {
+        StmtsCompiled(SmallVec1::One(stmt))
+    }
+
+    pub(crate) fn len(&self) -> usize {
+        match &self.0 {
+            SmallVec1::Empty => 0,
+            SmallVec1::One(_) => 1,
+            SmallVec1::Many(stmts) => stmts.len(),
+        }
+    }
+
+    pub(crate) fn is_empty(&self) -> bool {
+        match &self.0 {
+            SmallVec1::Empty => true,
+            SmallVec1::One(_) => false,
+            SmallVec1::Many(stmts) => {
+                debug_assert!(stmts.len() > 1);
+                false
+            }
+        }
+    }
+
+    pub(crate) fn extend(&mut self, right: StmtsCompiled) {
+        self.0.extend(right.0);
+    }
+
+    pub(crate) fn as_compiled(self) -> StmtCompiled {
+        match self.0 {
+            SmallVec1::Empty => box |_eval| Ok(()),
+            SmallVec1::One(stmt) => stmt,
+            SmallVec1::Many(vec) => {
+                debug_assert!(vec.len() > 1);
+                box move |eval| {
+                    for stmt in &vec {
+                        stmt(eval)?;
+                    }
+                    Ok(())
+                }
+            }
+        }
+    }
+}
+
 #[derive(Debug, Error)]
 enum AssignError {
     // Incorrect number of value to unpack (expected, got)