itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-10-01 11:30:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #14725 - epage:resolver-docs, r=weihanglo

Browse Source 
docs(resolver): Make room for v3 resolver
This commit is contained in:
bors 2024-10-23 20:45:00 +00:00
commit 944559f3f5
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/doc/src/reference/resolver.md
View File

@ -494,7 +494,7 @@ it so that it remains strictly acyclic.
## Resolver versions ## Resolver versions
A different feature resolver algorithm can be used by specifying the resolver Different resolver behavior can be specified through the resolver
version in `Cargo.toml` like this: version in `Cargo.toml` like this:
```toml ```toml
@ -503,12 +503,8 @@ name = "my-package"
version = "1.0.0" version = "1.0.0"
resolver = "2" resolver = "2"
``` ```
- `"1"` (workspace, [`edition = "2015"`](manifest.md#the-edition-field) default)
The version `"1"` resolver is the original resolver that shipped with Cargo up to version 1.50. - `"2"` ([`edition = "2021"`](manifest.md#the-edition-field) default): Introduces changes in [feature
The default is `"2"` if the root package specifies [`edition = "2021"`](manifest.md#the-edition-field) or a newer edition.
Otherwise the default is `"1"`.
The version `"2"` resolver introduces changes in [feature
unification](#features). See the [features chapter][features-2] for more unification](#features). See the [features chapter][features-2] for more
details. details.