Move dc into data

server/src/engine/core/index/key.rs

@@ -28,8 +28,8 @@
 use crate::{engine::data::spec::Dataspec1D, util::test_utils};
 use {
     crate::engine::{
-        core::model::cell::Datacell,
         data::{
+            cell::Datacell,
             lit::LitIR,
             spec::DataspecMeta1D,
             tag::{DataTag, TagUnique},

server/src/engine/core/mod.rs

@@ -41,8 +41,6 @@ use {
     },
     parking_lot::RwLock,
 };
-// re-exports
-pub use model::cell::Datacell;
 
 /// Use this for now since it substitutes for a file lock (and those syscalls are expensive),
 /// but something better is in the offing

server/src/engine/core/model/mod.rs

@@ -25,7 +25,6 @@
 */
 
 pub(super) mod alt;
-pub mod cell;
 
 #[cfg(test)]
 use std::cell::RefCell;
@@ -34,8 +33,10 @@ use super::util::EntityLocator;
 
 use {
     crate::engine::{
-        core::model::cell::Datacell,
-        data::tag::{DataTag, FullTag, TagClass, TagSelector},
+        data::{
+            cell::Datacell,
+            tag::{DataTag, FullTag, TagClass, TagSelector},
+        },
         error::{DatabaseError, DatabaseResult},
         idx::{IndexSTSeqCns, STIndex, STIndexSeq},
         mem::VInline,

server/src/engine/core/tests/model/layer.rs

@@ -80,7 +80,7 @@ mod layer_spec_validation {
 mod layer_data_validation {
     use {
         super::{layerview, layerview_nullable},
-        crate::engine::core::model::{self, cell::Datacell},
+        crate::engine::{core::model, data::cell::Datacell},
     };
     #[test]
     fn bool() {

server/src/engine/core/tests/space/alter.rs

@@ -26,10 +26,10 @@
 
 use crate::engine::{
     core::{
-        model::cell::Datacell,
         space::{Space, SpaceMeta},
         GlobalNS,
     },
+    data::cell::Datacell,
     error::DatabaseError,
 };
 

server/src/engine/core/tests/space/create.rs

@@ -26,10 +26,10 @@
 
 use crate::engine::{
     core::{
-        model::cell::Datacell,
         space::{Space, SpaceMeta},
         GlobalNS,
     },
+    data::cell::Datacell,
     error::DatabaseError,
 };
 

server/src/engine/data/md_dict.rs

@@ -26,8 +26,10 @@
 
 use {
     crate::engine::{
-        core::Datacell,
-        data::lit::{Lit, LitIR},
+        data::{
+            cell::Datacell,
+            lit::{Lit, LitIR},
+        },
         idx::STIndex,
     },
     std::collections::HashMap,

server/src/engine/data/mod.rs

@@ -26,6 +26,7 @@
 
 #[macro_use]
 mod macros;
+pub mod cell;
 pub mod lit;
 pub mod md_dict;
 pub mod spec;

server/src/engine/data/tests/md_dict_tests.rs

@@ -24,9 +24,9 @@
  *
 */
 
-use crate::engine::{
-    core::Datacell,
-    data::md_dict::{self, DictEntryGeneric, DictGeneric, MetaDict, MetaDictEntry},
+use crate::engine::data::{
+    cell::Datacell,
+    md_dict::{self, DictEntryGeneric, DictGeneric, MetaDict, MetaDictEntry},
 };
 
 #[test]

server/src/engine/ql/ast/mod.rs

@@ -36,8 +36,7 @@ use {
     },
     crate::{
         engine::{
-            core::Datacell,
-            data::lit::LitIR,
+            data::{cell::Datacell, lit::LitIR},
             error::{LangError, LangResult},
         },
         util::{compiler, MaybeInit},

server/src/engine/ql/dml/ins.rs

@@ -27,7 +27,7 @@
 use {
     crate::{
         engine::{
-            core::Datacell,
+            data::cell::Datacell,
             error::{LangError, LangResult},
             ql::{
                 ast::{Entity, QueryData, State},

server/src/engine/ql/tests.rs

@@ -27,7 +27,7 @@
 use {
     super::lex::{InsecureLexer, SafeLexer, Symbol, Token},
     crate::{
-        engine::{core::Datacell, error::LexResult},
+        engine::{data::cell::Datacell, error::LexResult},
         util::test_utils,
     },
     rand::{self, Rng},