about summary refs log tree commit diff
path: root/src/etc/natvis
diff options
context:
space:
mode:
authorWesley Wiser <wesleywiser@microsoft.com>2021-05-26 12:02:07 -0400
committerWesley Wiser <wesleywiser@microsoft.com>2021-06-02 10:23:12 -0400
commit3127419e2b2cb4ad2e44a06d30af6a015daf4557 (patch)
tree9a21fcf84ff04e4d747ae57ab26a6f13ba9ea945 /src/etc/natvis
parentef053fd6f0faa848097ff8b924ac859c667c8d15 (diff)
downloadrust-3127419e2b2cb4ad2e44a06d30af6a015daf4557.tar.gz
rust-3127419e2b2cb4ad2e44a06d30af6a015daf4557.zip
Respond to review feedback
Diffstat (limited to 'src/etc/natvis')
-rw-r--r--src/etc/natvis/intrinsic.natvis41
1 files changed, 21 insertions, 20 deletions
diff --git a/src/etc/natvis/intrinsic.natvis b/src/etc/natvis/intrinsic.natvis
index 09b5c9f091d..89280149a03 100644
--- a/src/etc/natvis/intrinsic.natvis
+++ b/src/etc/natvis/intrinsic.natvis
@@ -150,7 +150,7 @@
     </Expand>
   </Type>
   <Type Name="enum$&lt;*&gt;">
-    <Intrinsic Name="tag" Expression="Variant0.variant$" />
+    <Intrinsic Name="tag" Expression="variant0.variant$" />
     <DisplayString Condition="tag() == 0">{tag(),en}</DisplayString>
     <DisplayString Condition="tag() == 1" Optional="true">{tag(),en}</DisplayString>
     <DisplayString Condition="tag() == 2" Optional="true">{tag(),en}</DisplayString>
@@ -169,31 +169,32 @@
     <DisplayString Condition="tag() == 15" Optional="true">{tag(),en}</DisplayString>
 
     <Expand>
-      <ExpandedItem Condition="tag() == 0">Variant0</ExpandedItem>
-      <ExpandedItem Condition="tag() == 1" Optional="true">Variant1</ExpandedItem>
-      <ExpandedItem Condition="tag() == 2" Optional="true">Variant2</ExpandedItem>
-      <ExpandedItem Condition="tag() == 3" Optional="true">Variant3</ExpandedItem>
-      <ExpandedItem Condition="tag() == 4" Optional="true">Variant4</ExpandedItem>
-      <ExpandedItem Condition="tag() == 5" Optional="true">Variant5</ExpandedItem>
-      <ExpandedItem Condition="tag() == 6" Optional="true">Variant6</ExpandedItem>
-      <ExpandedItem Condition="tag() == 7" Optional="true">Variant7</ExpandedItem>
-      <ExpandedItem Condition="tag() == 8" Optional="true">Variant8</ExpandedItem>
-      <ExpandedItem Condition="tag() == 9" Optional="true">Variant9</ExpandedItem>
-      <ExpandedItem Condition="tag() == 10" Optional="true">Variant10</ExpandedItem>
-      <ExpandedItem Condition="tag() == 11" Optional="true">Variant11</ExpandedItem>
-      <ExpandedItem Condition="tag() == 12" Optional="true">Variant12</ExpandedItem>
-      <ExpandedItem Condition="tag() == 13" Optional="true">Variant13</ExpandedItem>
-      <ExpandedItem Condition="tag() == 14" Optional="true">Variant14</ExpandedItem>
-      <ExpandedItem Condition="tag() == 15" Optional="true">Variant15</ExpandedItem>
+      <ExpandedItem Condition="tag() == 0">variant0</ExpandedItem>
+      <ExpandedItem Condition="tag() == 1" Optional="true">variant1</ExpandedItem>
+      <ExpandedItem Condition="tag() == 2" Optional="true">variant2</ExpandedItem>
+      <ExpandedItem Condition="tag() == 3" Optional="true">variant3</ExpandedItem>
+      <ExpandedItem Condition="tag() == 4" Optional="true">variant4</ExpandedItem>
+      <ExpandedItem Condition="tag() == 5" Optional="true">variant5</ExpandedItem>
+      <ExpandedItem Condition="tag() == 6" Optional="true">variant6</ExpandedItem>
+      <ExpandedItem Condition="tag() == 7" Optional="true">variant7</ExpandedItem>
+      <ExpandedItem Condition="tag() == 8" Optional="true">variant8</ExpandedItem>
+      <ExpandedItem Condition="tag() == 9" Optional="true">variant9</ExpandedItem>
+      <ExpandedItem Condition="tag() == 10" Optional="true">variant10</ExpandedItem>
+      <ExpandedItem Condition="tag() == 11" Optional="true">variant11</ExpandedItem>
+      <ExpandedItem Condition="tag() == 12" Optional="true">variant12</ExpandedItem>
+      <ExpandedItem Condition="tag() == 13" Optional="true">variant13</ExpandedItem>
+      <ExpandedItem Condition="tag() == 14" Optional="true">variant14</ExpandedItem>
+      <ExpandedItem Condition="tag() == 15" Optional="true">variant15</ExpandedItem>
     </Expand>
   </Type>
 
-  <!-- $T1 is the name of the enum, $T2 is the low value of the dataful variant tag, $T3 is the high value of the dataful variant tag, $T4 is the name of the dataful variant -->
+  <!-- $T1 is the name of the enum, $T2 is the low value of the dataful variant tag,
+       $T3 is the high value of the dataful variant tag, $T4 is the name of the dataful variant -->
   <Type Name="enum$&lt;*, *, *, *&gt;">
-    <Intrinsic Name="tag" Expression="discriminant$.discriminant" />
+    <Intrinsic Name="tag" Expression="discriminant" />
     <Intrinsic Name="is_dataful" Expression="tag() &gt;= $T2 &amp;&amp; tag() &lt;= $T3" />
     <DisplayString Condition="is_dataful()">{"$T4",sb}({dataful_variant})</DisplayString>
-    <DisplayString Condition="!is_dataful()">{discriminant$.discriminant,en}</DisplayString>
+    <DisplayString Condition="!is_dataful()">{discriminant,en}</DisplayString>
     <Expand>
       <ExpandedItem Condition="is_dataful()">dataful_variant</ExpandedItem>
       <Synthetic Condition="is_dataful()" Name="[variant]">