From: Ralf Jung <post@ralfj.de>
Date: Mon, 15 Oct 2018 16:11:29 +0000 (+0200)
Subject: fix checking Mut access on frozen location
X-Git-Url: https://git.ralfj.de/web.git/commitdiff_plain/ce79f527e9ae2a9b9422367f538118ed87fb2a7d?hp=8f21ba14d4e6db8ca5115095264439d52190f2f4

fix checking Mut access on frozen location
---

diff --git a/ralf/_posts/2018-08-07-stacked-borrows.md b/ralf/_posts/2018-08-07-stacked-borrows.md
index 94f2bb6..37cdf50 100644
--- a/ralf/_posts/2018-08-07-stacked-borrows.md
+++ b/ralf/_posts/2018-08-07-stacked-borrows.md
@@ -336,8 +336,11 @@ impl MemoryByte {
         self.frz_since.map_or(false, |loc_t| loc_t <= acc_t),
       Mut(acc_m) =>
         // Raw pointers are fine with frozen locations. This is important because &Cell is raw!
-        (acc_m.is_raw() && self.frozen_since.is_some()) ||
-        self.borrows.last().map_or(false, |loc_itm| loc_itm == Mut(acc_m)),
+        if self.frozen_since.is_some() {
+          acc_m.is_raw()
+        } else {
+          self.borrows.last().map_or(false, |loc_itm| loc_itm == Mut(acc_m))
+        }
     }
   }