Skip to content
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.

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

Consider prerelease versions if version field of a dependency is unspecified (issue#600) #1459

Draft
wants to merge 1 commit into
base: spr/main/b67b43a0
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
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
28 changes: 19 additions & 9 deletions scarb/src/resolver/algorithm/provider.rs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::core::{
use itertools::Itertools;
use pubgrub::solver::{Dependencies, DependencyProvider};
use pubgrub::version_set::VersionSet;
use semver::{Version, VersionReq};
use semver::Version;
use semver_pubgrub::SemverPubgrub;
use std::cmp::Reverse;
use std::collections::{HashMap, HashSet};
Expand Down Expand Up @@ -280,29 +280,39 @@ impl<'a, 'c> DependencyProvider for PubGrubDependencyProvider<'a, 'c> {
.map(|dependency| {
let dependency =
self.rewrite_dependency_source_id(summary.package_id, &dependency)?;

let req = VersionReq::from(dependency.version_req.clone());
let dep_name = dependency.name.clone().to_string();
let summaries = self.query(dependency)?;
let summaries = self.query(dependency.clone())?;
summaries
.into_iter()
.find(|summary| req.matches(&summary.package_id.version))
.map(|summary| (summary, req.clone()))
.find(|summary| dependency.version_req.matches(&summary.package_id.version))
.map(|summary| (summary, dependency.version_req.clone()))
.ok_or_else(|| DependencyProviderError::PackageNotFound {
name: dep_name,
version: DependencyVersionReq::Req(req),
version: dependency.version_req.clone(),
})
})
.collect::<Result<Vec<(Summary, VersionReq)>, DependencyProviderError>>()?;
.collect::<Result<Vec<(Summary, DependencyVersionReq)>, DependencyProviderError>>()?;
let constraints = deps
.into_iter()
.map(|(summary, req)| (summary.package_id.into(), SemverPubgrub::from(&req)))
.map(|(summary, req)| (summary.package_id.into(), req.into()))
.collect();

Ok(Dependencies::Available(constraints))
}
}

impl From<DependencyVersionReq> for SemverPubgrub {
fn from(req: DependencyVersionReq) -> Self {
match req {
DependencyVersionReq::Req(req) => SemverPubgrub::from(&req),
DependencyVersionReq::Any => SemverPubgrub::empty().complement(),
DependencyVersionReq::Locked { exact, .. } => {
DependencyVersionReq::exact(&exact).into()
}
}
}
}

/// Error thrown while trying to execute `scarb` command.
#[derive(Error, Debug)]
#[non_exhaustive]
Expand Down
2 changes: 1 addition & 1 deletion scarb/src/resolver/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -511,7 +511,7 @@ mod tests {
registry![("foo v1.0.0", []),],
&[deps![("foo", "2.0.0"),]],
locks![("foo v1.0.0", [])],
Err("cannot find package foo"),
Err("cannot get dependencies of `[email protected]`"),
);
}

Expand Down
Loading