Skip to content

Commit 0d2ada8

Browse files
committed
docs(resolver): Make room for v3 resolver
1 parent 42f4143 commit 0d2ada8

File tree

1 file changed

+3
-7
lines changed

1 file changed

+3
-7
lines changed

src/doc/src/reference/resolver.md

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -494,7 +494,7 @@ it so that it remains strictly acyclic.
494494

495495
## Resolver versions
496496

497-
A different feature resolver algorithm can be used by specifying the resolver
497+
Different resolver behavior can be specified through the resolver
498498
version in `Cargo.toml` like this:
499499

500500
```toml
@@ -503,12 +503,8 @@ name = "my-package"
503503
version = "1.0.0"
504504
resolver = "2"
505505
```
506-
507-
The version `"1"` resolver is the original resolver that shipped with Cargo up to version 1.50.
508-
The default is `"2"` if the root package specifies [`edition = "2021"`](manifest.md#the-edition-field) or a newer edition.
509-
Otherwise the default is `"1"`.
510-
511-
The version `"2"` resolver introduces changes in [feature
506+
- `"1"` (workspace, [`edition = "2015"`](manifest.md#the-edition-field) default)
507+
- `"2"` ([`edition = "2021"`](manifest.md#the-edition-field) default): Introduces changes in [feature
512508
unification](#features). See the [features chapter][features-2] for more
513509
details.
514510

0 commit comments

Comments
 (0)