From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Fri, 20 May 2022 18:04:21 +0000 (+0100)
Subject: fastsplit: Promote construction of ipc_from_record
X-Git-Tag: otter-1.1.0~41
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3d4a6f6f45ea8ed2e783cd7ca80b3028d7cd4ed9;p=otter.git

fastsplit: Promote construction of ipc_from_record

fs_record borrows from ig, so doing this sooner is helpful so we can
pass ig to complex recalculation code.

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/fastsplit.rs b/src/fastsplit.rs
index 87d2b6da..5b492696 100644
--- a/src/fastsplit.rs
+++ b/src/fastsplit.rs
@@ -140,14 +140,15 @@ impl InstanceGuard<'_> {
       &mut ngpc
     )?;
 
+    let ipc_from_record = fs_record.ipc.clone();
+
     // Committing.
 
     // This is outside the infallible closure because borrowck
     // can't see that we drop tgpc before doing stuff with ig.
     tpc_new_z.implement(tgpc);
     (||{
-      let nipc = IFastSplits::make_ipc(&mut ig.ioccults.ilks,
-                                       fs_record.ipc.clone());
+      let nipc = IFastSplits::make_ipc(&mut ig.ioccults.ilks, ipc_from_record);
       let npiece = ig.gs.pieces.as_mut(modperm).insert(ngpc);
       ig.ipieces.as_mut(modperm).insert(npiece, nipc);