Skip to content

refactor: make use of the new if let chains pattern with Rust 1.88 #270

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
merged 1 commit into from
Jun 29, 2025
Merged

refactor: make use of the new if let chains pattern with Rust 1.88 #270

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
61 changes: 30 additions & 31 deletions crates/brioche-core/src/project/load.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,14 +551,14 @@ async fn load_project_inner(

// Validate expected project hashes in the group
for &(node, _, project_hash) in &group_project_entries {
if let Some(expected_hash) = project_graph.expected_hashes.remove(&node) {
if expected_hash != project_hash {
errors.push(LoadProjectError::InvalidProjectHash {
path: project_graph.graph[node].clone(),
expected_hash: expected_hash.to_string(),
actual_hash: project_hash.to_string(),
});
}
if let Some(expected_hash) = project_graph.expected_hashes.remove(&node)
&& expected_hash != project_hash
{
errors.push(LoadProjectError::InvalidProjectHash {
path: project_graph.graph[node].clone(),
expected_hash: expected_hash.to_string(),
actual_hash: project_hash.to_string(),
});
}
}

Expand Down Expand Up @@ -587,14 +587,14 @@ async fn load_project_inner(
for (node, (project_hash, project_entry, mut errors)) in nodes_to_projects {
let path = &project_graph.graph[node];

if let Some(expected_hash) = project_graph.expected_hashes.remove(&node) {
if expected_hash != project_hash {
errors.push(LoadProjectError::InvalidProjectHash {
path: project_graph.graph[node].clone(),
expected_hash: expected_hash.to_string(),
actual_hash: project_hash.to_string(),
});
}
if let Some(expected_hash) = project_graph.expected_hashes.remove(&node)
&& expected_hash != project_hash
{
errors.push(LoadProjectError::InvalidProjectHash {
path: project_graph.graph[node].clone(),
expected_hash: expected_hash.to_string(),
actual_hash: project_hash.to_string(),
});
}

projects.projects.insert(project_hash, project_entry);
Expand Down Expand Up @@ -674,23 +674,22 @@ async fn resolve_dependency_version_to_local_path(
dependency_version: &Version,
current_lockfile: Option<&Lockfile>,
) -> anyhow::Result<ResolvedDependency> {
if let Some(workspace) = workspace {
if let Some(workspace_path) =
if let Some(workspace) = workspace
&& let Some(workspace_path) =
resolve_workspace_project_path(workspace, dependency_name).await?
{
// Eventually, we'll validate that the version of the project
// from the workspace matches the requested dependency version
match dependency_version {
Version::Any => {}
}

return Ok(ResolvedDependency {
local_path: workspace_path,
expected_hash: None,
locking: config.locking,
should_lock: None,
});
{
// Eventually, we'll validate that the version of the project
// from the workspace matches the requested dependency version
match dependency_version {
Version::Any => {}
}

return Ok(ResolvedDependency {
local_path: workspace_path,
expected_hash: None,
locking: config.locking,
should_lock: None,
});
}

// TODO: Validate that the requested dependency version matches the
Expand Down