[move] Bugfix in Move model for enums (#18938)

MystenLabs · Aug 9, 2024 · c79f53f · c79f53f
1 parent 659b02b
commit c79f53f
Show file tree

Hide file tree

Showing 6 changed files with 666 additions and 18 deletions.
diff --git a/external-crates/move/crates/move-docgen/tests/sources/enums_test.move b/external-crates/move/crates/move-docgen/tests/sources/enums_test.move
@@ -1,5 +1,5 @@
 /// This is a doc comment above an annotation.
-#[allow(unused_const)]
+#[allow(unused)]
 module 0x42::m {
  /// This is a doc comment above an enum
  public enum Enum {
@@ -14,5 +14,19 @@ module 0x42::m {
  },
  E { x: u64, y: u64 },
  }
+
+ public enum GenericEnum<T> {
+ A(T),
+ B,
+ }
+
+ public struct X { x: Enum }
+ public struct Y(Enum)
+
+ public struct XG { x: GenericEnum<Enum> }
+ public struct YG(GenericEnum<Enum>)
+
+ public struct XGG<T> { x: GenericEnum<T> }
+ public struct YGG<T>(GenericEnum<T>)
 }
 
diff --git a/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline.md b/external-crates/move/crates/move-docgen/tests/sources/enums_test.spec_inline.md
@@ -6,13 +6,182 @@
 This is a doc comment above an annotation.
 
 
+- [Struct `X`](#0x42_m_X)
+- [Struct `Y`](#0x42_m_Y)
+- [Struct `XG`](#0x42_m_XG)
+- [Struct `YG`](#0x42_m_YG)
+- [Struct `XGG`](#0x42_m_XGG)
+- [Struct `YGG`](#0x42_m_YGG)
 - [Enum `Enum`](#0x42_m_Enum)
+- [Enum `GenericEnum`](#0x42_m_GenericEnum)
 
 
 <pre><code></code></pre>
 
 
 
+<a name="0x42_m_X"></a>
+
+## Struct `X`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_X">X</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_Y"></a>
+
+## Struct `Y`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_Y">Y</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::Enum</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_XG"></a>
+
+## Struct `XG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XG">XG</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_YG"></a>
+
+## Struct `YG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YG">YG</a>
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;m::Enum&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_XGG"></a>
+
+## Struct `XGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_XGG">XGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>x: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
+<a name="0x42_m_YGG"></a>
+
+## Struct `YGG`
+
+
+
+<pre><code><b>struct</b> <a href="enums_test.md#0x42_m_YGG">YGG</a>&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Fields</summary>
+
+
+<dl>
+<dt>
+<code>pos0: m::GenericEnum&lt;T&gt;</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
+</details>
+
 <a name="0x42_m_Enum"></a>
 
 ## Enum `Enum`
@@ -103,4 +272,47 @@ Variant <code>E</code>
 </dl>
 
 
+</details>
+
+<a name="0x42_m_GenericEnum"></a>
+
+## Enum `GenericEnum`
+
+
+
+<pre><code><b>public</b> enum GenericEnum&lt;T&gt;
+</code></pre>
+
+
+
+<details>
+<summary>Variants</summary>
+
+
+<dl>
+<dt>
+Variant <code>A</code>
+</dt>
+<dd>
+
+</dd>
+
+<dl>
+<dt>
+<code>pos0: T</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+<dt>
+Variant <code>B</code>
+</dt>
+<dd>
+
+</dd>
+</dl>
+
+
 </details>