Merge branch 'feature/cell-context'

broxus · Sep 25, 2023 · 4023d1a · 4023d1a
2 parents 6b87f11 + 7c2c742
commit 4023d1a
Show file tree

Hide file tree

Showing 4 changed files with 421 additions and 3 deletions.
diff --git a/src/cell/cell_impl/rc.rs b/src/cell/cell_impl/rc.rs
@@ -121,7 +121,7 @@ impl TryAsMut<DynCell> for Cell {
 }
 
 /// Empty context for single-threaded cells.
-#[derive(Default, Clone, Copy)]
+#[derive(Debug, Default, Clone, Copy)]
 pub struct EmptyCellContext;
 
 impl CellContext for EmptyCellContext {

diff --git a/src/cell/cell_impl/sync.rs b/src/cell/cell_impl/sync.rs
@@ -131,7 +131,7 @@ impl TryAsMut<DynCell> for Cell {
 }
 
 /// Empty context for thread-safe cells.
-#[derive(Default, Clone, Copy)]
+#[derive(Debug, Default, Clone, Copy)]
 pub struct EmptyCellContext;
 
 impl CellContext for EmptyCellContext {

diff --git a/src/dict/mod.rs b/src/dict/mod.rs
@@ -360,8 +360,9 @@ pub fn dict_insert_owned(
             std::cmp::Ordering::Equal => {
                 // Check if we can replace the value
                 if !mode.can_replace() {
+                    // TODO: change mode to `LoadMode::Noop` if copy-on-write for libraries is not ok.
                     let value = (
-                        ok!(stack_or_last(&stack, &root, context, LoadMode::Full)),
+                        ok!(stack_or_last(&stack, &root, context, LoadMode::Resolve)),
                         remaining_data.range(),
                     );
                     // TODO: what is the desired behavior for root as a library?