Fix parse error messages

* Previously some types would .unwrap() which causes ugly `unwrap` error message to be shown which would clutter the actual error message. Use the `?` to fail gracefully and return the actual error message.
juhaku · Apr 4, 2022 · 0c43bff · 0c43bff
1 parent 7a5a945
commit 0c43bff
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/utoipa-gen/src/component/attr.rs b/utoipa-gen/src/component/attr.rs
@@ -96,7 +96,7 @@ impl Parse for ComponentAttr<Enum> {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
         Ok(Self { inner: enum_attr })
@@ -152,7 +152,7 @@ impl Parse for ComponentAttr<Struct> {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
 
@@ -190,7 +190,7 @@ impl Parse for ComponentAttr<UnnamedFieldStruct> {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
 
@@ -291,7 +291,7 @@ impl Parse for ComponentAttr<NamedField> {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
 

diff --git a/utoipa-gen/src/component/xml.rs b/utoipa-gen/src/component/xml.rs
@@ -78,7 +78,7 @@ impl Parse for XmlAttr {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
 

diff --git a/utoipa-gen/src/lib.rs b/utoipa-gen/src/lib.rs
@@ -835,7 +835,7 @@ impl Parse for ExternalDocs {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
 

diff --git a/utoipa-gen/src/openapi.rs b/utoipa-gen/src/openapi.rs
@@ -79,7 +79,7 @@ impl Parse for OpenApiAttr {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap_or_abort();
+                input.parse::<Token![,]>()?;
             }
         }
 
@@ -171,7 +171,7 @@ impl Parse for Tag {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }
 

diff --git a/utoipa-gen/src/path.rs b/utoipa-gen/src/path.rs
@@ -184,7 +184,7 @@ impl Parse for PathAttr {
             }
 
             if !input.is_empty() {
-                input.parse::<Token![,]>().unwrap();
+                input.parse::<Token![,]>()?;
             }
         }