From cd68bd9baba18496ae8ecb9ac652d884ebc0b79d Mon Sep 17 00:00:00 2001
From: Markus Everling <markuseverling@gmail.com>
Date: Sun, 27 Nov 2022 15:55:13 +0100
Subject: [PATCH] Fix natvis `VecDeque` formatter

---
 src/etc/natvis/liballoc.natvis | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/src/etc/natvis/liballoc.natvis b/src/etc/natvis/liballoc.natvis
index 41f4a3767f59..c4ad98ec1d3a 100644
--- a/src/etc/natvis/liballoc.natvis
+++ b/src/etc/natvis/liballoc.natvis
@@ -12,20 +12,19 @@
     </Expand>
   </Type>
   <Type Name="alloc::collections::vec_deque::VecDeque&lt;*&gt;">
-    <DisplayString>{{ len={tail &lt;= head ? head - tail : buf.cap - tail + head} }}</DisplayString>
+    <DisplayString>{{ len={len} }}</DisplayString>
     <Expand>
-      <Item Name="[len]" ExcludeView="simple">tail &lt;= head ? head - tail : buf.cap - tail + head</Item>
+      <Item Name="[len]" ExcludeView="simple">len</Item>
       <Item Name="[capacity]" ExcludeView="simple">buf.cap</Item>
       <CustomListItems>
-        <Variable Name="i" InitialValue="tail" />
-
-        <Size>tail &lt;= head ? head - tail : buf.cap - tail + head</Size>
+        <Variable Name="i" InitialValue="0" />
+        <Size>len</Size>
         <Loop>
-          <If Condition="i == head">
+          <If Condition="i == len">
             <Break/>
           </If>
-          <Item>buf.ptr.pointer.pointer[i]</Item>
-          <Exec>i = (i + 1 == buf.cap ? 0 : i + 1)</Exec>
+          <Item>buf.ptr.pointer.pointer[(i + head) % buf.cap]</Item>
+          <Exec>i = i + 1</Exec>
         </Loop>
       </CustomListItems>
     </Expand>