From 94892ca5cc7f14df23b1eae32a8e66bb9451d913 Mon Sep 17 00:00:00 2001
From: Sumera Priyadarsini <sylphrenadin@gmail.com>
Date: Tue, 23 Mar 2021 19:33:31 +0530
Subject: [PATCH 1/2] rust: module.rs: Replace unwrap() with expect()

Use expect() instead of unwrap() to add more details
about the error in case of a panic.

Fixes #90.

Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
---
 rust/module.rs | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/rust/module.rs b/rust/module.rs
index 95d30a95972d98..12aa1736aa2969 100644
--- a/rust/module.rs
+++ b/rust/module.rs
@@ -42,7 +42,7 @@ fn expect_ident(it: &mut token_stream::IntoIter) -> String {
 }
 
 fn expect_punct(it: &mut token_stream::IntoIter) -> char {
-    if let TokenTree::Punct(punct) = it.next().unwrap() {
+    if let TokenTree::Punct(punct) = it.next().expect("Expected Punct") {
         punct.as_char()
     } else {
         panic!("Expected Punct");
@@ -54,7 +54,7 @@ fn expect_literal(it: &mut token_stream::IntoIter) -> String {
 }
 
 fn expect_group(it: &mut token_stream::IntoIter) -> Group {
-    if let TokenTree::Group(group) = it.next().unwrap() {
+    if let TokenTree::Group(group) = it.next().expect("Expected group") {
         group
     } else {
         panic!("Expected Group");
@@ -84,7 +84,7 @@ fn expect_array_fields(it: &mut token_stream::IntoIter) -> ParamType {
 }
 
 fn expect_type(it: &mut token_stream::IntoIter) -> ParamType {
-    if let TokenTree::Ident(ident) = it.next().unwrap() {
+    if let TokenTree::Ident(ident) = it.next().expect("Expected param type") {
         match ident.to_string().as_ref() {
             "ArrayParam" => expect_array_fields(it),
             _ => ParamType::Ident(ident.to_string()),
@@ -576,7 +576,8 @@ pub fn module(ts: TokenStream) -> TokenStream {
         ));
     }
 
-    let file = std::env::var("RUST_MODFILE").unwrap();
+    let file =
+        std::env::var("RUST_MODFILE").expect("Unable to fetch key for environmental variable");
 
     format!(
         "
@@ -672,5 +673,5 @@ pub fn module(ts: TokenStream) -> TokenStream {
         params_modinfo = params_modinfo,
         generated_array_types = generated_array_types,
         initcall_section = ".initcall6.init"
-    ).parse().unwrap()
+    ).parse().expect("Unable to return formatted string")
 }

From 243acc5686faadfccf2f576e2a2d0846227ae317 Mon Sep 17 00:00:00 2001
From: Sumera Priyadarsini <sylphrenadin@gmail.com>
Date: Mon, 29 Mar 2021 14:11:10 +0530
Subject: [PATCH 2/2] [V4]rust: module.rs: Update error messages based on
 feedback

Signed-off-by: Sumera Priyadarsini <sylphrenadin@gmail.com>
---
 rust/module.rs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/rust/module.rs b/rust/module.rs
index 12aa1736aa2969..d87c0d2433f9e3 100644
--- a/rust/module.rs
+++ b/rust/module.rs
@@ -42,7 +42,7 @@ fn expect_ident(it: &mut token_stream::IntoIter) -> String {
 }
 
 fn expect_punct(it: &mut token_stream::IntoIter) -> char {
-    if let TokenTree::Punct(punct) = it.next().expect("Expected Punct") {
+    if let TokenTree::Punct(punct) = it.next().expect("Reached end of token stream for Punct") {
         punct.as_char()
     } else {
         panic!("Expected Punct");
@@ -54,7 +54,7 @@ fn expect_literal(it: &mut token_stream::IntoIter) -> String {
 }
 
 fn expect_group(it: &mut token_stream::IntoIter) -> Group {
-    if let TokenTree::Group(group) = it.next().expect("Expected group") {
+    if let TokenTree::Group(group) = it.next().expect("Reached end of token stream for Group") {
         group
     } else {
         panic!("Expected Group");
@@ -84,7 +84,10 @@ fn expect_array_fields(it: &mut token_stream::IntoIter) -> ParamType {
 }
 
 fn expect_type(it: &mut token_stream::IntoIter) -> ParamType {
-    if let TokenTree::Ident(ident) = it.next().expect("Expected param type") {
+    if let TokenTree::Ident(ident) = it
+        .next()
+        .expect("Reached end of token stream for param type")
+    {
         match ident.to_string().as_ref() {
             "ArrayParam" => expect_array_fields(it),
             _ => ParamType::Ident(ident.to_string()),
@@ -577,7 +580,7 @@ pub fn module(ts: TokenStream) -> TokenStream {
     }
 
     let file =
-        std::env::var("RUST_MODFILE").expect("Unable to fetch key for environmental variable");
+        std::env::var("RUST_MODFILE").expect("Unable to fetch RUST_MODFILE environmental variable");
 
     format!(
         "
@@ -673,5 +676,5 @@ pub fn module(ts: TokenStream) -> TokenStream {
         params_modinfo = params_modinfo,
         generated_array_types = generated_array_types,
         initcall_section = ".initcall6.init"
-    ).parse().expect("Unable to return formatted string")
+    ).parse().expect("Error parsing formatted string into token stream.")
 }