mirror of
https://github.com/rust-lang/cargo
synced 2024-11-05 18:50:39 +00:00
Stop gating feature "resolver"
This commit is contained in:
parent
555209ce06
commit
74f20d25e2
1 changed files with 0 additions and 15 deletions
|
@ -1175,14 +1175,6 @@ impl TomlManifest {
|
|||
features.require(Feature::metabuild())?;
|
||||
}
|
||||
|
||||
if project.resolver.is_some()
|
||||
|| me
|
||||
.workspace
|
||||
.as_ref()
|
||||
.map_or(false, |ws| ws.resolver.is_some())
|
||||
{
|
||||
features.require(Feature::resolver())?;
|
||||
}
|
||||
let resolve_behavior = match (
|
||||
project.resolver.as_ref(),
|
||||
me.workspace.as_ref().and_then(|ws| ws.resolver.as_ref()),
|
||||
|
@ -1522,13 +1514,6 @@ impl TomlManifest {
|
|||
if let Some(profiles) = &profiles {
|
||||
profiles.validate(&features, &mut warnings)?;
|
||||
}
|
||||
if me
|
||||
.workspace
|
||||
.as_ref()
|
||||
.map_or(false, |ws| ws.resolver.is_some())
|
||||
{
|
||||
features.require(Feature::resolver())?;
|
||||
}
|
||||
let resolve_behavior = me
|
||||
.workspace
|
||||
.as_ref()
|
||||
|
|
Loading…
Reference in a new issue