From d8bbc7858622b6d9c278469aab701ca0b609cddf Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Wed, 15 May 2024 05:35:49 +0200
Subject: Merging upstream version 126.0.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 third_party/rust/weedle2/src/lib.rs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'third_party/rust/weedle2/src/lib.rs')

diff --git a/third_party/rust/weedle2/src/lib.rs b/third_party/rust/weedle2/src/lib.rs
index 610a34fa14..71ab7c33b5 100644
--- a/third_party/rust/weedle2/src/lib.rs
+++ b/third_party/rust/weedle2/src/lib.rs
@@ -23,7 +23,7 @@
 
 use self::argument::ArgumentList;
 use self::attribute::ExtendedAttributeList;
-use self::common::{Braced, Identifier, Parenthesized, PunctuatedNonEmpty};
+use self::common::{Braced, Docstring, Identifier, Parenthesized, PunctuatedNonEmpty};
 use self::dictionary::DictionaryMembers;
 use self::interface::{Inheritance, InterfaceMembers};
 use self::literal::StringLit;
@@ -109,6 +109,7 @@ ast_types! {
         }),
         /// Parses `[attributes]? callback interface identifier ( : inheritance )? { members };`
         CallbackInterface(struct CallbackInterfaceDefinition<'a> {
+            docstring: Option<Docstring>,
             attributes: Option<ExtendedAttributeList<'a>>,
             callback: term!(callback),
             interface: term!(interface),
@@ -119,6 +120,7 @@ ast_types! {
         }),
         /// Parses `[attributes]? interface identifier ( : inheritance )? { members };`
         Interface(struct InterfaceDefinition<'a> {
+            docstring: Option<Docstring>,
             attributes: Option<ExtendedAttributeList<'a>>,
             interface: term!(interface),
             identifier: Identifier<'a>,
@@ -137,6 +139,7 @@ ast_types! {
         }),
         /// Parses `[attributes]? namespace identifier { members };`
         Namespace(struct NamespaceDefinition<'a> {
+            docstring: Option<Docstring>,
             attributes: Option<ExtendedAttributeList<'a>>,
             namespace: term!(namespace),
             identifier: Identifier<'a>,
@@ -145,6 +148,7 @@ ast_types! {
         }),
         /// Parses `[attributes]? dictionary identifier ( : inheritance )? { members };`
         Dictionary(struct DictionaryDefinition<'a> {
+            docstring: Option<Docstring>,
             attributes: Option<ExtendedAttributeList<'a>>,
             dictionary: term!(dictionary),
             identifier: Identifier<'a>,
@@ -191,6 +195,7 @@ ast_types! {
         }),
         /// Parses `[attributes]? enum identifier { values };`
         Enum(struct EnumDefinition<'a> {
+            docstring: Option<Docstring>,
             attributes: Option<ExtendedAttributeList<'a>>,
             enum_: term!(enum),
             identifier: Identifier<'a>,
@@ -224,8 +229,15 @@ ast_types! {
     }
 }
 
+ast_types! {
+    struct EnumVariant<'a> {
+        docstring: Option<Docstring>,
+        value: StringLit<'a>,
+    }
+}
+
 /// Parses a non-empty enum value list
-pub type EnumValueList<'a> = PunctuatedNonEmpty<StringLit<'a>, term!(,)>;
+pub type EnumValueList<'a> = PunctuatedNonEmpty<EnumVariant<'a>, term!(,)>;
 
 #[cfg(test)]
 mod test {
-- 
cgit v1.2.3