Skip to content

Commit 5580453

Browse files
committed
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 <[email protected]>
1 parent 4f0e492 commit 5580453

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

rust/module.rs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ fn expect_ident(it: &mut token_stream::IntoIter) -> String {
4242
}
4343

4444
fn expect_punct(it: &mut token_stream::IntoIter) -> char {
45-
if let TokenTree::Punct(punct) = it.next().unwrap() {
45+
if let TokenTree::Punct(punct) = it.next().expect("Expected Punct") {
4646
punct.as_char()
4747
} else {
4848
panic!("Expected Punct");
@@ -54,7 +54,7 @@ fn expect_literal(it: &mut token_stream::IntoIter) -> String {
5454
}
5555

5656
fn expect_group(it: &mut token_stream::IntoIter) -> Group {
57-
if let TokenTree::Group(group) = it.next().unwrap() {
57+
if let TokenTree::Group(group) = it.next().expect("Expected group") {
5858
group
5959
} else {
6060
panic!("Expected Group");
@@ -84,7 +84,7 @@ fn expect_array_fields(it: &mut token_stream::IntoIter) -> ParamType {
8484
}
8585

8686
fn expect_type(it: &mut token_stream::IntoIter) -> ParamType {
87-
if let TokenTree::Ident(ident) = it.next().unwrap() {
87+
if let TokenTree::Ident(ident) = it.next().expect("Expected param type") {
8888
match ident.to_string().as_ref() {
8989
"ArrayParam" => expect_array_fields(it),
9090
_ => ParamType::Ident(ident.to_string()),
@@ -577,7 +577,8 @@ pub fn module(ts: TokenStream) -> TokenStream {
577577
));
578578
}
579579

580-
let file = std::env::var("RUST_MODFILE").unwrap();
580+
let file =
581+
std::env::var("RUST_MODFILE").expect("Unable to fetch key for environmental variable");
581582

582583
format!(
583584
"
@@ -673,5 +674,5 @@ pub fn module(ts: TokenStream) -> TokenStream {
673674
params_modinfo = params_modinfo,
674675
generated_array_types = generated_array_types,
675676
initcall_section = ".initcall6.init"
676-
).parse().unwrap()
677+
).parse().expect("Unable to return formatted string")
677678
}

0 commit comments

Comments
 (0)