From 8a361bb68a98cf0c0da5cc722fc727b83c896b95 Mon Sep 17 00:00:00 2001 From: Folkert Date: Fri, 20 May 2022 18:41:23 +0200 Subject: [PATCH] disable caching of builtin modules for now --- compiler/load/build.rs | 20 ++++++++++---------- compiler/load/src/lib.rs | 36 ++++++++++++++++++------------------ 2 files changed, 28 insertions(+), 28 deletions(-) diff --git a/compiler/load/build.rs b/compiler/load/build.rs index 0ec18fa578..cc590b0de7 100644 --- a/compiler/load/build.rs +++ b/compiler/load/build.rs @@ -5,16 +5,16 @@ use roc_load_internal::file::Threading; use roc_module::symbol::ModuleId; const MODULES: &[(ModuleId, &str)] = &[ - (ModuleId::BOOL, "Bool.roc"), - (ModuleId::RESULT, "Result.roc"), - (ModuleId::NUM, "Num.roc"), - (ModuleId::LIST, "List.roc"), - (ModuleId::STR, "Str.roc"), - (ModuleId::DICT, "Dict.roc"), - (ModuleId::SET, "Set.roc"), - (ModuleId::BOX, "Box.roc"), - (ModuleId::ENCODE, "Encode.roc"), - (ModuleId::JSON, "Json.roc"), +// (ModuleId::BOOL, "Bool.roc"), +// (ModuleId::RESULT, "Result.roc"), +// (ModuleId::NUM, "Num.roc"), +// (ModuleId::LIST, "List.roc"), +// (ModuleId::STR, "Str.roc"), +// (ModuleId::DICT, "Dict.roc"), +// (ModuleId::SET, "Set.roc"), +// (ModuleId::BOX, "Box.roc"), +// (ModuleId::ENCODE, "Encode.roc"), +// (ModuleId::JSON, "Json.roc"), ]; fn main() { diff --git a/compiler/load/src/lib.rs b/compiler/load/src/lib.rs index 9548d95889..41f508cd1d 100644 --- a/compiler/load/src/lib.rs +++ b/compiler/load/src/lib.rs @@ -180,14 +180,14 @@ pub fn load_and_typecheck_str<'a>( } } -const BOOL: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Bool.dat")) as &[_]; -const RESULT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Result.dat")) as &[_]; -const LIST: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/List.dat")) as &[_]; -const STR: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Str.dat")) as &[_]; -const DICT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Dict.dat")) as &[_]; -const SET: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Set.dat")) as &[_]; -const BOX: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Box.dat")) as &[_]; -const NUM: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Num.dat")) as &[_]; +// const BOOL: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Bool.dat")) as &[_]; +// const RESULT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Result.dat")) as &[_]; +// const LIST: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/List.dat")) as &[_]; +// const STR: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Str.dat")) as &[_]; +// const DICT: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Dict.dat")) as &[_]; +// const SET: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Set.dat")) as &[_]; +// const BOX: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Box.dat")) as &[_]; +// const NUM: &[u8] = include_bytes!(concat!(env!("OUT_DIR"), "/Num.dat")) as &[_]; fn deserialize_help(bytes: &[u8]) -> (Subs, Vec<(Symbol, Variable)>) { let (subs, slice) = Subs::deserialize(bytes); @@ -201,16 +201,16 @@ fn read_cached_subs() -> MutMap)> { // Wasm seems to re-order definitions between build time and runtime, but only in release mode. // That is very strange, but we can solve it separately if !cfg!(target_family = "wasm") { - output.insert(ModuleId::BOOL, deserialize_help(BOOL)); - output.insert(ModuleId::RESULT, deserialize_help(RESULT)); - output.insert(ModuleId::NUM, deserialize_help(NUM)); - - output.insert(ModuleId::LIST, deserialize_help(LIST)); - output.insert(ModuleId::STR, deserialize_help(STR)); - output.insert(ModuleId::DICT, deserialize_help(DICT)); - - output.insert(ModuleId::SET, deserialize_help(SET)); - output.insert(ModuleId::BOX, deserialize_help(BOX)); + // output.insert(ModuleId::BOOL, deserialize_help(BOOL)); + // output.insert(ModuleId::RESULT, deserialize_help(RESULT)); + // output.insert(ModuleId::NUM, deserialize_help(NUM)); + // + // output.insert(ModuleId::LIST, deserialize_help(LIST)); + // output.insert(ModuleId::STR, deserialize_help(STR)); + // output.insert(ModuleId::DICT, deserialize_help(DICT)); + // + // output.insert(ModuleId::SET, deserialize_help(SET)); + // output.insert(ModuleId::BOX, deserialize_help(BOX)); } output