Skip to content

Remove an #[allow(unnecessary_unwrap)] #644

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ltratt merged 1 commit into from
Jul 12, 2026
Merged

Remove an #[allow(unnecessary_unwrap)] #644

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions cfgrammar/src/lib/yacc/grammar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -993,7 +993,6 @@ where

/// Return the cost of a minimal string for each rule in this grammar. The cost of a
/// token is specified by the user-defined `token_cost` function.
#[allow(clippy::unnecessary_unwrap)]
fn rule_min_costs<StorageT: 'static + PrimInt + Unsigned>(
grm: &YaccGrammar<StorageT>,
token_costs: &[u8],
Expand Down Expand Up @@ -1060,9 +1059,11 @@ where
ls_noncmplt = Some(c);
}
}
if ls_cmplt.is_some() && (ls_noncmplt.is_none() || ls_cmplt < ls_noncmplt) {
debug_assert!(ls_cmplt.unwrap() >= costs[i]);
costs[i] = ls_cmplt.unwrap();
if let Some(low_cmplt) = ls_cmplt
&& (ls_noncmplt.is_none() || ls_cmplt < ls_noncmplt)
{
debug_assert!(low_cmplt >= costs[i]);
costs[i] = low_cmplt;
done[i] = true;
} else if let Some(ls_noncmplt) = ls_noncmplt {
debug_assert!(ls_noncmplt >= costs[i]);
Expand All @@ -1080,7 +1081,6 @@ where
/// Return the cost of the maximal string for each rule in this grammar (u32::max_val()
/// representing "this rule can generate strings of infinite length"). The cost of a
/// token is specified by the user-defined `token_cost` function.
#[allow(clippy::unnecessary_unwrap)]
fn rule_max_costs<StorageT: 'static + PrimInt + Unsigned>(
grm: &YaccGrammar<StorageT>,
token_costs: &[u8],
Expand Down Expand Up @@ -1144,9 +1144,11 @@ where
hs_noncmplt = Some(c);
}
}
if hs_cmplt.is_some() && (hs_noncmplt.is_none() || hs_cmplt > hs_noncmplt) {
debug_assert!(hs_cmplt.unwrap() >= costs[i]);
costs[i] = hs_cmplt.unwrap();
if let Some(high_cmplt) = hs_cmplt
&& (hs_noncmplt.is_none() || hs_cmplt > hs_noncmplt)
{
debug_assert!(high_cmplt >= costs[i]);
costs[i] = high_cmplt;
done[i] = true;
} else if let Some(hs_noncmplt) = hs_noncmplt {
debug_assert!(hs_noncmplt >= costs[i]);
Expand Down