Skip to content

Use sets to compare locked dependencies #317

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
mara-schulke merged 2 commits into from
Jun 10, 2026
Merged

Use sets to compare locked dependencies #317

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf51e59
Use btreesets to compare dependencies
mara-schulke Jun 10, 2026
b82ff08
Use hash sets
mara-schulke Jun 10, 2026
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
14 changes: 10 additions & 4 deletions src/lock.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.

use std::{collections::BTreeMap, path::Path};
use std::{
collections::{BTreeMap, HashSet},
path::Path,
};

use miette::{Context, IntoDiagnostic, ensure};
use semver::Version;
Expand All @@ -39,7 +42,7 @@ pub const LOCKFILE: &str = "Proto.lock";
/// A locked dependency with exact name and version
///
/// Serializes as "name version" string (Cargo format)
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord)]
#[derive(Debug, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
pub enum LockedDependency {
/// A dependency identified only by name
Named {
Expand Down Expand Up @@ -654,8 +657,11 @@ impl TryFrom<Vec<LockedPackage>> for WorkspaceLockfile {
locked.digest
);
}
// Dependencies should be identical for same (name, version)
if existing.dependencies != locked.dependencies {
// Dependencies are conceptually an unordered set for a
// given (name, version) — compare without regard to order.
let existing_deps: HashSet<_> = existing.dependencies.iter().collect();
let locked_deps: HashSet<_> = locked.dependencies.iter().collect();
if existing_deps != locked_deps {
tracing::warn!(
"dependencies mismatch for {}@{}: {:?} vs {:?}. Using first seen.",
locked.name,
Expand Down
Loading