Add map_unwrap_or clippy rule#7829
Merged
Merged
Conversation
Contributor
|
Note Reviews pausedIt looks like this branch is under active development. To avoid overwhelming you with review comments due to an influx of new commits, CodeRabbit has automatically paused this review. You can configure this behavior by changing the Use the following commands to manage reviews:
Use the checkboxes below for quick actions:
No actionable comments were generated in the recent review. 🎉 ℹ️ Recent review info⚙️ Run configurationConfiguration used: Path: .coderabbit.yml Review profile: CHILL Plan: Pro Run ID: 📒 Files selected for processing (1)
✅ Files skipped from review due to trivial changes (1)
📝 WalkthroughWalkthroughThis PR refactors many compiler, stdlib, and VM sites to replace ChangesOption Handling Modernization
Estimated code review effort🎯 2 (Simple) | ⏱️ ~10 minutes Possibly related PRs
Suggested reviewers
🚥 Pre-merge checks | ✅ 5✅ Passed checks (5 passed)
✏️ Tip: You can configure your own custom pre-merge checks in the settings. ✨ Finishing Touches🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
Contributor
There was a problem hiding this comment.
Actionable comments posted: 1
🧹 Nitpick comments (1)
crates/vm/src/getpath.rs (1)
146-157: ⚡ Quick winSimplify by using pattern matching instead of
map_or_elsewithin a guaranteed-Some context.The code uses
map_or_elseinside anif venv_prefix.is_some()block, which means the None branch (|| calculated_prefix.clone()) is unreachable dead code. This makes the logic unnecessarily complex.♻️ Proposed refactor using pattern matching
- // Step 5: Set prefix and base_prefix - if venv_prefix.is_some() { - // In venv: prefix = venv directory, base_prefix = original Python's prefix - paths.prefix = venv_prefix.as_ref().map_or_else( - || calculated_prefix.clone(), - |p| p.to_string_lossy().into_owned(), - ); - paths.base_prefix = calculated_prefix; - } else { - // Not in venv: prefix == base_prefix - paths.prefix = calculated_prefix.clone(); - paths.base_prefix = calculated_prefix; - } + // Step 5: Set prefix and base_prefix + if let Some(venv) = venv_prefix.as_ref() { + // In venv: prefix = venv directory, base_prefix = original Python's prefix + paths.prefix = venv.to_string_lossy().into_owned(); + paths.base_prefix = calculated_prefix; + } else { + // Not in venv: prefix == base_prefix + paths.prefix = calculated_prefix.clone(); + paths.base_prefix = calculated_prefix; + }🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the rest with a brief reason, keep changes minimal, and validate. In `@crates/vm/src/getpath.rs` around lines 146 - 157, The current block uses map_or_else inside an if venv_prefix.is_some() branch leaving the None closure dead; replace that with pattern matching: use if let Some(p) = venv_prefix.as_ref() (or match venv_prefix.as_ref()) and set paths.prefix = p.to_string_lossy().into_owned() and paths.base_prefix = calculated_prefix in that arm, keeping the existing else branch that sets paths.prefix = calculated_prefix.clone() and paths.base_prefix = calculated_prefix.
🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
Inline comments:
In `@crates/stdlib/src/csv.rs`:
- Around line 965-968: The trim_spaces function can panic when input is all
spaces because trimmed_start becomes input.len() and trimmed_end becomes 0; fix
by detecting that case and returning an empty slice instead of slicing with
start > end: after computing trimmed_start and trimmed_end (variables in
trim_spaces), if trimmed_start >= trimmed_end return an empty slice (e.g.,
&input[0..0]) otherwise return &input[trimmed_start..trimmed_end]; this prevents
the panic for all-space fields.
---
Nitpick comments:
In `@crates/vm/src/getpath.rs`:
- Around line 146-157: The current block uses map_or_else inside an if
venv_prefix.is_some() branch leaving the None closure dead; replace that with
pattern matching: use if let Some(p) = venv_prefix.as_ref() (or match
venv_prefix.as_ref()) and set paths.prefix = p.to_string_lossy().into_owned()
and paths.base_prefix = calculated_prefix in that arm, keeping the existing else
branch that sets paths.prefix = calculated_prefix.clone() and paths.base_prefix
= calculated_prefix.
🪄 Autofix (Beta)
Fix all unresolved CodeRabbit comments on this PR:
- Push a commit to this branch (recommended)
- Create a new PR with the fixes
ℹ️ Review info
⚙️ Run configuration
Configuration used: Path: .coderabbit.yml
Review profile: CHILL
Plan: Pro
Run ID: 6293fec9-0c76-4c43-9ada-76964c5b6190
📒 Files selected for processing (46)
Cargo.tomlcrates/codegen/src/compile.rscrates/codegen/src/ir.rscrates/codegen/src/symboltable.rscrates/common/src/cformat.rscrates/derive-impl/src/pyclass.rscrates/sre_engine/src/string.rscrates/stdlib/src/_asyncio.rscrates/stdlib/src/_opcode.rscrates/stdlib/src/bisect.rscrates/stdlib/src/csv.rscrates/stdlib/src/faulthandler.rscrates/stdlib/src/json.rscrates/stdlib/src/math.rscrates/stdlib/src/mmap.rscrates/stdlib/src/ssl.rscrates/stdlib/src/ssl/compat.rscrates/vm/src/builtins/float.rscrates/vm/src/builtins/frame.rscrates/vm/src/builtins/function.rscrates/vm/src/builtins/iter.rscrates/vm/src/builtins/module.rscrates/vm/src/builtins/object.rscrates/vm/src/builtins/singletons.rscrates/vm/src/builtins/str.rscrates/vm/src/builtins/template.rscrates/vm/src/builtins/type.rscrates/vm/src/exceptions.rscrates/vm/src/frame.rscrates/vm/src/getpath.rscrates/vm/src/object/ext.rscrates/vm/src/stdlib/_ast/statement.rscrates/vm/src/stdlib/_codecs.rscrates/vm/src/stdlib/_collections.rscrates/vm/src/stdlib/_ctypes/array.rscrates/vm/src/stdlib/_ctypes/base.rscrates/vm/src/stdlib/_ctypes/function.rscrates/vm/src/stdlib/_ctypes/pointer.rscrates/vm/src/stdlib/_ctypes/simple.rscrates/vm/src/stdlib/_functools.rscrates/vm/src/stdlib/_io.rscrates/vm/src/stdlib/_sre.rscrates/vm/src/stdlib/_typing.rscrates/vm/src/stdlib/builtins.rscrates/vm/src/types/slot.rscrates/vm/src/warn.rs
Comment on lines
965
to
968
| fn trim_spaces(input: &[u8]) -> &[u8] { | ||
| let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len()); | ||
| let trimmed_end = input | ||
| .iter() | ||
| .rposition(|&x| x != b' ') | ||
| .map(|i| i + 1) | ||
| .unwrap_or(0); | ||
| let trimmed_end = input.iter().rposition(|&x| x != b' ').map_or(0, |i| i + 1); | ||
| &input[trimmed_start..trimmed_end] |
Contributor
There was a problem hiding this comment.
trim_spaces can panic on all-space fields.
At Line 967, all-space input yields trimmed_start = input.len() and trimmed_end = 0, so &input[trimmed_start..trimmed_end] panics.
Suggested fix
fn trim_spaces(input: &[u8]) -> &[u8] {
let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len());
- let trimmed_end = input.iter().rposition(|&x| x != b' ').map_or(0, |i| i + 1);
+ let trimmed_end = input
+ .iter()
+ .rposition(|&x| x != b' ')
+ .map_or(trimmed_start, |i| i + 1);
&input[trimmed_start..trimmed_end]
}📝 Committable suggestion
‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.
Suggested change
| fn trim_spaces(input: &[u8]) -> &[u8] { | |
| let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len()); | |
| let trimmed_end = input | |
| .iter() | |
| .rposition(|&x| x != b' ') | |
| .map(|i| i + 1) | |
| .unwrap_or(0); | |
| let trimmed_end = input.iter().rposition(|&x| x != b' ').map_or(0, |i| i + 1); | |
| &input[trimmed_start..trimmed_end] | |
| fn trim_spaces(input: &[u8]) -> &[u8] { | |
| let trimmed_start = input.iter().position(|&x| x != b' ').unwrap_or(input.len()); | |
| let trimmed_end = input | |
| .iter() | |
| .rposition(|&x| x != b' ') | |
| .map_or(trimmed_start, |i| i + 1); | |
| &input[trimmed_start..trimmed_end] | |
| } |
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.
In `@crates/stdlib/src/csv.rs` around lines 965 - 968, The trim_spaces function
can panic when input is all spaces because trimmed_start becomes input.len() and
trimmed_end becomes 0; fix by detecting that case and returning an empty slice
instead of slicing with start > end: after computing trimmed_start and
trimmed_end (variables in trim_spaces), if trimmed_start >= trimmed_end return
an empty slice (e.g., &input[0..0]) otherwise return
&input[trimmed_start..trimmed_end]; this prevents the panic for all-space
fields.
youknowone
approved these changes
May 11, 2026
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary by CodeRabbit
No public APIs or user-facing behavior changed.