Skip to content

Commit

Permalink
fix(msrv): Don't require -Zmsrv-policy for resolver=3
Browse files Browse the repository at this point in the history
We still have `edition2024` guarding this.

Dealing with two feature flags to control behavior is messy.  We just
need to make sure both get stabilized :).
  • Loading branch information
epage committed Apr 22, 2024
1 parent 14b46ec commit 88f6acf
Showing 1 changed file with 0 additions and 3 deletions.
3 changes: 0 additions & 3 deletions src/cargo/core/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -310,9 +310,6 @@ impl<'gctx> Workspace<'gctx> {
ResolveBehavior::V1 | ResolveBehavior::V2 => {}
ResolveBehavior::V3 => {
if self.resolve_behavior == ResolveBehavior::V3 {
if !self.gctx().cli_unstable().msrv_policy {
anyhow::bail!("`resolver=\"3\"` requires `-Zmsrv-policy`");
}
self.resolve_honors_rust_version = true;
}
}
Expand Down

0 comments on commit 88f6acf

Please sign in to comment.