user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix misuse of ?

Browse source 
This exited the whole loop instead of having continue semantics and
continuing to find workspaces. So wrap in find_map.
This commit is contained in:
Cormac Relf 2025-12-02 14:11:52 +11:00
parent ac641771a8
commit 3b97d38702
1 changed files with 10 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/tools/rust-analyzer/crates/rust-analyzer/src/global_state.rs
View file

@ -847,21 +847,18 @@ impl GlobalStateSnapshot {
&self,
package: &Arc<PackageId>,
) -> Option<FxHashSet<Arc<PackageId>>> {
for workspace in self.workspaces.iter() {
match &workspace.kind {
ProjectWorkspaceKind::Cargo { cargo, .. }
| ProjectWorkspaceKind::DetachedFile { cargo: Some((cargo, _, _)), .. } => {
let package = cargo.packages().find(|p| cargo[*p].id == *package)?;
self.workspaces.iter().find_map(|workspace| match &workspace.kind {
ProjectWorkspaceKind::Cargo { cargo, .. }
| ProjectWorkspaceKind::DetachedFile { cargo: Some((cargo, _, _)), .. } => {
let package = cargo.packages().find(|p| cargo[*p].id == *package)?;
return cargo[package]
.all_member_deps
.as_ref()
.map(|deps| deps.iter().map(|dep| cargo[*dep].id.clone()).collect());
}
_ => {}
return cargo[package]
.all_member_deps
.as_ref()
.map(|deps| deps.iter().map(|dep| cargo[*dep].id.clone()).collect());
}
}
None
_ => None,
})
}
pub(crate) fn file_exists(&self, file_id: FileId) -> bool {