clippy fixes, fmt

ast/src/canonicalization/canonicalize.rs

@@ -18,7 +18,7 @@ use crate::{
         env::Env,
         scope::Scope,
     },
-    pool::{pool_str::PoolStr, pool_vec::PoolVec, shallow_clone::ShallowClone},
+    mem_pool::{pool_str::PoolStr, pool_vec::PoolVec, shallow_clone::ShallowClone},
 };
 
 pub(crate) enum CanonicalizeRecordProblem {
@@ -275,7 +275,7 @@ pub(crate) fn canonicalize_lookup(
                 Var(symbol)
             }
             Err(problem) => {
-                env.problem(Problem::RuntimeError(problem.clone()));
+                env.problem(Problem::RuntimeError(problem));
 
                 RuntimeError()
             }
@@ -292,7 +292,7 @@ pub(crate) fn canonicalize_lookup(
             Err(problem) => {
                 // Either the module wasn't imported, or
                 // it was imported but it doesn't expose this ident.
-                env.problem(Problem::RuntimeError(problem.clone()));
+                env.problem(Problem::RuntimeError(problem));
 
                 RuntimeError()
             }

ast/src/canonicalization/module.rs

@@ -24,10 +24,10 @@ use crate::lang::core::types::Alias;
 use crate::lang::core::val_def::ValueDef;
 use crate::lang::env::Env;
 use crate::lang::scope::Scope;
-use crate::pool::pool::NodeId;
+use crate::mem_pool::pool::NodeId;
-use crate::pool::pool::Pool;
+use crate::mem_pool::pool::Pool;
-use crate::pool::pool_vec::PoolVec;
+use crate::mem_pool::pool_vec::PoolVec;
-use crate::pool::shallow_clone::ShallowClone;
+use crate::mem_pool::shallow_clone::ShallowClone;
 
 pub struct ModuleOutput {
     pub aliases: MutMap<Symbol, NodeId<Alias>>,

ast/src/constrain.rs

@@ -26,7 +26,7 @@ use crate::{
         },
         env::Env,
     },
-    pool::{pool::Pool, pool_str::PoolStr, pool_vec::PoolVec, shallow_clone::ShallowClone},
+    mem_pool::{pool::Pool, pool_str::PoolStr, pool_vec::PoolVec, shallow_clone::ShallowClone},
 };
 
 #[derive(Debug)]
@@ -1781,7 +1781,7 @@ pub mod test_constrain {
             env::Env,
             scope::Scope,
         },
-        pool::pool::Pool,
+        mem_pool::pool::Pool,
         solve_type,
     };
     use indoc::indoc;

ast/src/lang/core/ast.rs

@@ -1,6 +1,6 @@
 use crate::{
     ast_error::{ASTNodeIdWithoutExprId, ASTResult},
-    pool::pool::Pool,
+    mem_pool::pool::Pool,
 };
 
 use super::{

ast/src/lang/core/declaration.rs

@@ -2,7 +2,7 @@ use roc_types::subs::VarStore;
 
 use crate::{
     lang::core::{def::def::Def, expr::expr2::Expr2},
-    pool::{pool::Pool, pool_vec::PoolVec},
+    mem_pool::{pool::Pool, pool_vec::PoolVec},
 };
 
 use super::def::def::Declaration;

ast/src/lang/core/def/def.rs

@@ -37,7 +37,7 @@ use crate::{
         rigids::Rigids,
         scope::Scope,
     },
-    pool::{pool::Pool, pool_vec::PoolVec, shallow_clone::ShallowClone},
+    mem_pool::{pool::Pool, pool_vec::PoolVec, shallow_clone::ShallowClone},
 };
 
 #[derive(Debug)]

ast/src/lang/core/def/def2.rs

@@ -3,7 +3,7 @@ use crate::{
         expr::{expr2::Expr2, expr2_to_string::expr2_to_string},
         pattern::Pattern2,
     },
-    pool::pool::{NodeId, Pool},
+    mem_pool::pool::{NodeId, Pool},
 };
 
 // A top level definition, not inside a function. For example: `main = "Hello, world!"`

ast/src/lang/core/expr/expr2.rs

@@ -3,7 +3,7 @@ use roc_types::subs::Variable;
 
 use crate::{
     lang::core::{fun_def::FunctionDef, pattern::Pattern2, val_def::ValueDef},
-    pool::{pool::NodeId, pool_str::PoolStr, pool_vec::PoolVec},
+    mem_pool::{pool::NodeId, pool_str::PoolStr, pool_vec::PoolVec},
 };
 use roc_can::expr::Recursive;
 use roc_module::low_level::LowLevel;

ast/src/lang/core/expr/expr2_to_string.rs

@@ -1,6 +1,6 @@
 use crate::{
     lang::core::{expr::record_field::RecordField, val_def::value_def_to_string},
-    pool::pool::Pool,
+    mem_pool::pool::Pool,
 };
 
 use super::expr2::{Expr2, ExprId};

ast/src/lang/core/expr/expr_to_expr2.rs

@@ -9,7 +9,7 @@ use roc_problem::can::{Problem, RuntimeError};
 use roc_region::all::{Located, Region};
 
 use super::{expr2::Expr2, output::Output};
-use crate::canonicalize::canonicalize::{
+use crate::canonicalization::canonicalize::{
     canonicalize_fields, canonicalize_lookup, canonicalize_when_branch, CanonicalizeRecordProblem,
 };
 use crate::lang::core::declaration::decl_to_let;
@@ -17,14 +17,14 @@ use crate::lang::core::def::def::{canonicalize_defs, sort_can_defs};
 use crate::lang::core::expr::expr2::ClosureExtra;
 use crate::lang::core::pattern::to_pattern2;
 use crate::lang::core::str::flatten_str_literal;
-use crate::pool::shallow_clone::ShallowClone;
+use crate::mem_pool::shallow_clone::ShallowClone;
 use crate::{
     lang::{
         core::expr::expr2::{ExprId, FloatVal, IntStyle, IntVal},
         env::Env,
         scope::Scope,
     },
-    pool::{pool_str::PoolStr, pool_vec::PoolVec},
+    mem_pool::{pool_str::PoolStr, pool_vec::PoolVec},
 };
 
 pub fn loc_expr_to_expr2<'a>(
@@ -65,7 +65,7 @@ pub fn to_expr2<'a>(
                     // emit runtime error
                     let runtime_error = RuntimeError::InvalidFloat(error, ZERO, raw.into());
 
-                    env.problem(Problem::RuntimeError(runtime_error.clone()));
+                    env.problem(Problem::RuntimeError(runtime_error));
                     //
                     //                    Expr::RuntimeError(runtime_error)
                     todo!()
@@ -94,7 +94,7 @@ pub fn to_expr2<'a>(
                         raw.into(),
                     );
 
-                    env.problem(Problem::RuntimeError(runtime_error.clone()));
+                    env.problem(Problem::RuntimeError(runtime_error));
                     //
                     //                    Expr::RuntimeError(runtime_error)
                     todo!()
@@ -122,7 +122,7 @@ pub fn to_expr2<'a>(
                     // emit runtime error
                     let runtime_error = RuntimeError::InvalidInt(error, *base, ZERO, raw.into());
 
-                    env.problem(Problem::RuntimeError(runtime_error.clone()));
+                    env.problem(Problem::RuntimeError(runtime_error));
                     //
                     //                    Expr::RuntimeError(runtime_error)
                     todo!()
@@ -130,7 +130,7 @@ pub fn to_expr2<'a>(
             }
         }
 
-        Str(literal) => flatten_str_literal(env, scope, &literal),
+        Str(literal) => flatten_str_literal(env, scope, literal),
 
         List { items, .. } => {
             let mut output = Output::default();
@@ -585,7 +585,7 @@ pub fn to_expr2<'a>(
             let (unsorted, mut scope, defs_output, symbols_introduced) = canonicalize_defs(
                 env,
                 Output::default(),
-                &scope,
+                scope,
                 loc_defs,
                 PatternType::DefExpr,
             );

ast/src/lang/core/expr/output.rs

@@ -1,6 +1,6 @@
 use crate::{
     lang::core::{def::def::References, types::Alias},
-    pool::pool::NodeId,
+    mem_pool::pool::NodeId,
 };
 use roc_collections::all::{MutMap, MutSet};
 use roc_module::symbol::Symbol;

ast/src/lang/core/expr/record_field.rs

@@ -1,6 +1,6 @@
 use roc_types::subs::Variable;
 
-use crate::pool::pool_str::PoolStr;
+use crate::mem_pool::pool_str::PoolStr;
 use roc_module::symbol::Symbol;
 
 use super::expr2::ExprId;

ast/src/lang/core/fun_def.rs

@@ -1,6 +1,6 @@
 use crate::{
     lang::rigids::Rigids,
-    pool::{pool::NodeId, pool_vec::PoolVec, shallow_clone::ShallowClone},
+    mem_pool::{pool::NodeId, pool_vec::PoolVec, shallow_clone::ShallowClone},
 };
 use roc_module::symbol::Symbol;
 use roc_types::subs::Variable;

ast/src/lang/core/pattern.rs

@@ -18,10 +18,10 @@ use crate::constrain::Constraint;
 use crate::lang::core::expr::expr_to_expr2::to_expr_id;
 use crate::lang::env::Env;
 use crate::lang::scope::Scope;
-use crate::pool::pool::{NodeId, Pool};
+use crate::mem_pool::pool::{NodeId, Pool};
-use crate::pool::pool_str::PoolStr;
+use crate::mem_pool::pool_str::PoolStr;
-use crate::pool::pool_vec::PoolVec;
+use crate::mem_pool::pool_vec::PoolVec;
-use crate::pool::shallow_clone::ShallowClone;
+use crate::mem_pool::shallow_clone::ShallowClone;
 
 use super::expr::expr2::{ExprId, FloatVal, IntVal};
 use super::expr::output::Output;

ast/src/lang/core/str.rs

@@ -4,7 +4,7 @@ use roc_parse::ast::StrLiteral;
 use crate::{
     ast_error::{ASTResult, UnexpectedASTNode},
     lang::{core::expr::expr_to_expr2::to_expr2, env::Env, scope::Scope},
-    pool::{pool::Pool, pool_str::PoolStr, pool_vec::PoolVec},
+    mem_pool::{pool::Pool, pool_str::PoolStr, pool_vec::PoolVec},
 };
 
 use super::expr::{
@@ -123,7 +123,7 @@ fn flatten_str_lines<'a>(
 
 /// Resolve string interpolations by desugaring a sequence of StrSegments
 /// into nested calls to Str.concat
-fn desugar_str_segments<'a>(env: &mut Env<'a>, segments: Vec<StrSegment>) -> Expr2 {
+fn desugar_str_segments(env: &mut Env, segments: Vec<StrSegment>) -> Expr2 {
     use StrSegment::*;
 
     let pool = &mut env.pool;

ast/src/lang/core/types.rs

@@ -11,10 +11,10 @@ use roc_types::{subs::Variable, types::ErrorType};
 
 use crate::lang::env::Env;
 use crate::lang::scope::Scope;
-use crate::pool::pool::{NodeId, Pool};
+use crate::mem_pool::pool::{NodeId, Pool};
-use crate::pool::pool_str::PoolStr;
+use crate::mem_pool::pool_str::PoolStr;
-use crate::pool::pool_vec::PoolVec;
+use crate::mem_pool::pool_vec::PoolVec;
-use crate::pool::shallow_clone::ShallowClone;
+use crate::mem_pool::shallow_clone::ShallowClone;
 
 pub type TypeId = NodeId<Type2>;
 

ast/src/lang/core/val_def.rs

@@ -1,6 +1,6 @@
 use crate::{
     lang::{core::expr::expr2_to_string::expr2_to_string, rigids::Rigids},
-    pool::{
+    mem_pool::{
         pool::{NodeId, Pool},
         shallow_clone::ShallowClone,
     },

ast/src/lang/env.rs

@@ -6,7 +6,7 @@ use roc_problem::can::{Problem, RuntimeError};
 use roc_region::all::{Located, Region};
 use roc_types::subs::VarStore;
 
-use crate::pool::pool::{NodeId, Pool};
+use crate::mem_pool::pool::{NodeId, Pool};
 
 use super::core::def::def::References;
 
@@ -147,7 +147,7 @@ impl<'a> Env<'a> {
                             Ok(symbol)
                         }
                         None => Err(RuntimeError::ValueNotExposed {
-                            module_name: ModuleName::from(module_name),
+                            module_name,
                             ident,
                             region,
                         }),

ast/src/lang/rigids.rs

@@ -3,7 +3,9 @@ use std::{
     hash::BuildHasherDefault,
 };
 
-use crate::pool::{pool::Pool, pool_str::PoolStr, pool_vec::PoolVec, shallow_clone::ShallowClone};
+use crate::mem_pool::{
+    pool::Pool, pool_str::PoolStr, pool_vec::PoolVec, shallow_clone::ShallowClone,
+};
 use roc_collections::all::WyHash;
 use roc_types::subs::Variable;
 
@@ -45,11 +47,7 @@ impl Rigids {
             .names
             .iter(pool)
             .filter_map(|(opt_pool_str, var)| {
-                if let Some(pool_str) = opt_pool_str {
+                opt_pool_str.as_ref().map(|pool_str| (*pool_str, *var))
-                    Some((*pool_str, *var))
-                } else {
-                    None
-                }
             })
             .collect::<Vec<(PoolStr, Variable)>>();
 

ast/src/lang/scope.rs

@@ -2,10 +2,10 @@
 #![allow(dead_code)]
 #![allow(unused_imports)]
 
-use crate::pool::pool::Pool;
+use crate::mem_pool::pool::Pool;
-use crate::pool::pool_str::PoolStr;
+use crate::mem_pool::pool_str::PoolStr;
-use crate::pool::pool_vec::PoolVec;
+use crate::mem_pool::pool_vec::PoolVec;
-use crate::pool::shallow_clone::ShallowClone;
+use crate::mem_pool::shallow_clone::ShallowClone;
 use roc_collections::all::{MutMap, MutSet};
 use roc_module::ident::{Ident, Lowercase};
 use roc_module::symbol::{IdentIds, ModuleId, Symbol};

ast/src/lib.rs

@@ -1,7 +1,7 @@
 pub mod ast_error;
-mod canonicalize;
+mod canonicalization;
 pub mod constrain;
 pub mod lang;
+pub mod mem_pool;
 pub mod parse;
-pub mod pool;
 pub mod solve_type;

ast/src/solve_type.rs

@@ -19,9 +19,9 @@ use roc_unify::unify::Unified::*;
 
 use crate::constrain::Constraint;
 use crate::lang::core::types::Type2;
-use crate::pool::pool::Pool;
+use crate::mem_pool::pool::Pool;
-use crate::pool::pool_vec::PoolVec;
+use crate::mem_pool::pool_vec::PoolVec;
-use crate::pool::shallow_clone::ShallowClone;
+use crate::mem_pool::shallow_clone::ShallowClone;
 
 // Type checking system adapted from Elm by Evan Czaplicki, BSD-3-Clause Licensed
 // https://github.com/elm/compiler

code_markup/src/markup/attribute.rs

@@ -65,10 +65,6 @@ pub struct Attributes {
 }
 
 impl Attributes {
-    pub fn new() -> Attributes {
-        Attributes { all: Vec::new() }
-    }
-
     pub fn add(&mut self, attr: Attribute) {
         self.all.push(attr);
     }
@@ -121,3 +117,9 @@ impl Attributes {
         Ok(())
     }
 }
+
+impl Default for Attributes {
+    fn default() -> Self {
+        Attributes { all: Vec::new() }
+    }
+}

code_markup/src/markup/common_nodes.rs

@@ -9,7 +9,7 @@ pub fn new_equals_mn(ast_node_id: ASTNodeId, parent_id_opt: Option<MarkNodeId>)
         content: nodes::EQUALS.to_owned(),
         ast_node_id,
         syn_high_style: HighlightStyle::Operator,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -20,7 +20,7 @@ pub fn new_comma_mn(expr_id: ExprId, parent_id_opt: Option<MarkNodeId>) -> Marku
         content: nodes::COMMA.to_owned(),
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::Blank,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -30,7 +30,7 @@ pub fn new_blank_mn(ast_node_id: ASTNodeId, parent_id_opt: Option<MarkNodeId>) -
     MarkupNode::Blank {
         ast_node_id,
         syn_high_style: HighlightStyle::Blank,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -44,7 +44,7 @@ pub fn new_blank_mn_w_nls(
     MarkupNode::Blank {
         ast_node_id,
         syn_high_style: HighlightStyle::Blank,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: nr_of_newlines,
     }
@@ -55,7 +55,7 @@ pub fn new_colon_mn(expr_id: ExprId, parent_id_opt: Option<MarkNodeId>) -> Marku
         content: nodes::COLON.to_owned(),
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::Operator,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -66,7 +66,7 @@ pub fn new_left_accolade_mn(expr_id: ExprId, parent_id_opt: Option<MarkNodeId>)
         content: nodes::LEFT_ACCOLADE.to_owned(),
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -77,7 +77,7 @@ pub fn new_right_accolade_mn(expr_id: ExprId, parent_id_opt: Option<MarkNodeId>)
         content: nodes::RIGHT_ACCOLADE.to_owned(),
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -88,7 +88,7 @@ pub fn new_left_square_mn(expr_id: ExprId, parent_id_opt: Option<MarkNodeId>) ->
         content: nodes::LEFT_SQUARE_BR.to_owned(),
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }
@@ -99,7 +99,7 @@ pub fn new_right_square_mn(expr_id: ExprId, parent_id_opt: Option<MarkNodeId>) -
         content: nodes::RIGHT_SQUARE_BR.to_owned(),
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::Bracket,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: 0,
     }

code_markup/src/markup/nodes.rs

@@ -56,7 +56,7 @@ use roc_ast::{
         },
         env::Env,
     },
-    pool::pool_str::PoolStr,
+    mem_pool::pool_str::PoolStr,
 };
 use roc_module::symbol::Interns;
 use roc_utils::{index_of, slice_get};
@@ -323,7 +323,7 @@ fn new_markup_node(
         content: text,
         ast_node_id: node_id,
         syn_high_style: highlight_style,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt: None,
         newlines_at_end: 0,
     };
@@ -528,7 +528,7 @@ pub fn expr2_to_markup<'a, 'b>(
                 content: val_name,
                 ast_node_id,
                 syn_high_style: HighlightStyle::Variable,
-                attributes: Attributes::new(),
+                attributes: Attributes::default(),
                 parent_id_opt: None,
                 newlines_at_end: 0,
             };
@@ -637,7 +637,7 @@ fn header_mn(content: String, expr_id: ExprId, mark_node_pool: &mut SlowPool) ->
         content,
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: HighlightStyle::PackageRelated,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt: None,
         newlines_at_end: 0,
     };
@@ -655,7 +655,7 @@ fn header_val_mn(
         content,
         ast_node_id: ASTNodeId::AExprId(expr_id),
         syn_high_style: highlight_style,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt: None,
         newlines_at_end: 0,
     };

code_markup/src/markup/top_level_def.rs

@@ -31,7 +31,7 @@ pub fn tld_mark_node<'a>(
         content: val_name,
         ast_node_id,
         syn_high_style: HighlightStyle::Variable,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt: None,
         newlines_at_end: 0,
     };

code_markup/src/slow_pool.rs

@@ -10,10 +10,6 @@ pub struct SlowPool {
 }
 
 impl SlowPool {
-    pub fn new() -> SlowPool {
-        SlowPool { nodes: Vec::new() }
-    }
-
     pub fn add(&mut self, node: MarkupNode) -> MarkNodeId {
         let id = self.nodes.len();
 
@@ -73,3 +69,9 @@ impl fmt::Display for SlowPool {
         Ok(())
     }
 }
+
+impl Default for SlowPool {
+    fn default() -> Self {
+        SlowPool { nodes: Vec::new() }
+    }
+}

editor/src/editor/main.rs

@@ -24,7 +24,7 @@ use cgmath::Vector2;
 use fs_extra::dir::{copy, ls, CopyOptions, DirEntryAttr, DirEntryValue};
 use pipelines::RectResources;
 use roc_ast::lang::env::Env;
-use roc_ast::pool::pool::Pool;
+use roc_ast::mem_pool::pool::Pool;
 use roc_can::builtins::builtin_defs_map;
 use roc_collections::all::MutMap;
 use roc_load;

editor/src/editor/mvc/ed_model.rs

@@ -13,8 +13,8 @@ use bumpalo::Bump;
 use nonempty::NonEmpty;
 use roc_ast::lang::core::ast::{ASTNodeId, AST};
 use roc_ast::lang::env::Env;
+use roc_ast::mem_pool::pool_str::PoolStr;
 use roc_ast::parse::parse_ast;
-use roc_ast::pool::pool_str::PoolStr;
 use roc_code_markup::markup::nodes::ast_to_mark_nodes;
 use roc_code_markup::slow_pool::{MarkNodeId, SlowPool};
 use roc_load::file::LoadedModule;
@@ -57,7 +57,7 @@ pub fn init_model<'a>(
 ) -> EdResult<EdModel<'a>> {
     let mut module = EdModule::new(code_str, env, code_arena)?;
 
-    let mut mark_node_pool = SlowPool::new();
+    let mut mark_node_pool = SlowPool::default();
 
     let markup_ids = if code_str.is_empty() {
         EmptyCodeString {}.fail()
@@ -211,7 +211,7 @@ pub mod test_ed_model {
     use bumpalo::Bump;
     use ed_model::EdModel;
     use roc_ast::lang::env::Env;
-    use roc_ast::pool::pool::Pool;
+    use roc_ast::mem_pool::pool::Pool;
     use roc_load::file::LoadedModule;
     use roc_module::symbol::IdentIds;
     use roc_module::symbol::ModuleIds;

editor/src/editor/mvc/ed_update.rs

@@ -59,8 +59,8 @@ use roc_ast::lang::core::def::def2::DefId;
 use roc_ast::lang::core::expr::expr2::Expr2;
 use roc_ast::lang::core::expr::expr2::ExprId;
 use roc_ast::lang::core::types::Type2;
-use roc_ast::pool::pool::Pool;
+use roc_ast::mem_pool::pool::Pool;
-use roc_ast::pool::pool_str::PoolStr;
+use roc_ast::mem_pool::pool_str::PoolStr;
 use roc_ast::solve_type;
 use roc_can::expected::Expected;
 use roc_code_markup::markup::attribute::Attributes;
@@ -589,7 +589,7 @@ impl<'a> EdModel<'a> {
 
             let blank_replacement = MarkupNode::Blank {
                 ast_node_id: sel_block.ast_node_id,
-                attributes: Attributes::new(),
+                attributes: Attributes::default(),
                 syn_high_style: HighlightStyle::Blank,
                 parent_id_opt: expr2_level_mark_node.get_parent_id_opt(),
                 newlines_at_end,

editor/src/editor/mvc/ed_view.rs

@@ -14,7 +14,7 @@ use crate::ui::text::selection::Selection;
 use crate::ui::tooltip::ToolTip;
 use crate::ui::ui_error::MissingGlyphDims;
 use cgmath::Vector2;
-use roc_ast::pool::pool::Pool;
+use roc_ast::mem_pool::pool::Pool;
 use snafu::OptionExt;
 use winit::dpi::PhysicalSize;
 

editor/src/editor/mvc/int_update.rs

@@ -1,7 +1,7 @@
 use roc_ast::lang::core::expr::expr2::Expr2::SmallInt;
 use roc_ast::lang::core::expr::expr2::IntStyle;
 use roc_ast::lang::core::expr::expr2::IntVal;
-use roc_ast::pool::pool_str::PoolStr;
+use roc_ast::mem_pool::pool_str::PoolStr;
 use roc_code_markup::markup::attribute::Attributes;
 use roc_code_markup::markup::nodes::MarkupNode;
 use roc_code_markup::slow_pool::MarkNodeId;
@@ -49,7 +49,7 @@ pub fn start_new_int(ed_model: &mut EdModel, digit_char: &char) -> EdResult<Inpu
         content: digit_string,
         ast_node_id,
         syn_high_style: HighlightStyle::Number,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt,
         newlines_at_end: curr_mark_node_nls,
     };

editor/src/editor/mvc/let_update.rs

@@ -67,7 +67,7 @@ pub fn start_new_let_value(ed_model: &mut EdModel, new_char: &char) -> EdResult<
         content: val_name_string,
         ast_node_id,
         syn_high_style: HighlightStyle::Variable,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt: Some(curr_mark_node_id),
         newlines_at_end: curr_mark_node_nls,
     };

editor/src/editor/mvc/list_update.rs

@@ -1,6 +1,6 @@
 use roc_ast::lang::core::ast::{ast_node_to_string, ASTNodeId};
 use roc_ast::lang::core::expr::expr2::{Expr2, ExprId};
-use roc_ast::pool::pool_vec::PoolVec;
+use roc_ast::mem_pool::pool_vec::PoolVec;
 use roc_code_markup::markup::common_nodes::{
     new_blank_mn, new_comma_mn, new_left_square_mn, new_right_square_mn,
 };

editor/src/editor/mvc/lookup_update.rs

@@ -1,5 +1,5 @@
 use roc_ast::lang::core::expr::expr2::{Expr2, ExprId};
-use roc_ast::pool::pool_str::PoolStr;
+use roc_ast::mem_pool::pool_str::PoolStr;
 use roc_code_markup::slow_pool::MarkNodeId;
 
 use crate::editor::ed_error::EdResult;

editor/src/editor/mvc/record_update.rs

@@ -11,8 +11,8 @@ use roc_ast::lang::core::ast::ASTNodeId;
 use roc_ast::lang::core::expr::expr2::Expr2;
 use roc_ast::lang::core::expr::expr2::ExprId;
 use roc_ast::lang::core::expr::record_field::RecordField;
-use roc_ast::pool::pool_str::PoolStr;
+use roc_ast::mem_pool::pool_str::PoolStr;
-use roc_ast::pool::pool_vec::PoolVec;
+use roc_ast::mem_pool::pool_vec::PoolVec;
 use roc_code_markup::markup::attribute::Attributes;
 use roc_code_markup::markup::common_nodes::new_blank_mn;
 use roc_code_markup::markup::common_nodes::new_left_accolade_mn;
@@ -126,7 +126,7 @@ pub fn update_empty_record(
                 content: new_input.to_owned(),
                 ast_node_id,
                 syn_high_style: HighlightStyle::RecordField,
-                attributes: Attributes::new(),
+                attributes: Attributes::default(),
                 parent_id_opt,
                 newlines_at_end: 0,
             };
@@ -235,7 +235,7 @@ pub fn update_record_colon(
                                             content: record_colon.to_owned(),
                                             ast_node_id: ASTNodeId::AExprId(record_ast_node_id),
                                             syn_high_style: HighlightStyle::Operator,
-                                            attributes: Attributes::new(),
+                                            attributes: Attributes::default(),
                                             parent_id_opt: Some(parent_id),
                                             newlines_at_end: 0,
                                         };

editor/src/editor/mvc/string_update.rs

@@ -1,7 +1,7 @@
 use roc_ast::lang::core::expr::expr2::ArrString;
 use roc_ast::lang::core::expr::expr2::Expr2;
 use roc_ast::lang::core::str::update_str_expr;
-use roc_ast::pool::pool_str::PoolStr;
+use roc_ast::mem_pool::pool_str::PoolStr;
 use roc_code_markup::markup::attribute::Attributes;
 use roc_code_markup::markup::nodes;
 use roc_code_markup::markup::nodes::MarkupNode;
@@ -150,7 +150,7 @@ pub fn start_new_string(ed_model: &mut EdModel) -> EdResult<InputOutcome> {
             content: nodes::STRING_QUOTES.to_owned(),
             ast_node_id,
             syn_high_style: HighlightStyle::String,
-            attributes: Attributes::new(),
+            attributes: Attributes::default(),
             parent_id_opt,
             newlines_at_end: curr_mark_node_nls,
         };

editor/src/editor/mvc/tld_value_update.rs

@@ -8,7 +8,7 @@ use roc_ast::{
         },
         env::Env,
     },
-    pool::pool::NodeId,
+    mem_pool::pool::NodeId,
 };
 use roc_code_markup::{
     markup::{
@@ -49,7 +49,7 @@ pub fn tld_mark_node<'a>(
         content: val_name,
         ast_node_id,
         syn_high_style: HighlightStyle::Variable,
-        attributes: Attributes::new(),
+        attributes: Attributes::default(),
         parent_id_opt: None,
         newlines_at_end: 0,
     };