From 0ba124016a70dd19bd46ea2bba9c7822fb3601cc Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 30 Oct 2024 11:20:44 -0500 Subject: [PATCH 1/2] docs(resolver): Specify MSRV for package.resolver --- src/doc/src/reference/resolver.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/doc/src/reference/resolver.md b/src/doc/src/reference/resolver.md index 3e40a7e7b0a..9adea28e621 100644 --- a/src/doc/src/reference/resolver.md +++ b/src/doc/src/reference/resolver.md @@ -519,6 +519,8 @@ members = ["member1", "member2"] resolver = "2" ``` +> **MSRV:** Requires 1.51+ + [virtual workspace]: workspaces.md#virtual-workspace [features-2]: features.md#feature-resolver-version-2 From 315746543f1d512c8dc7fa8d9f391b6f3ebadc79 Mon Sep 17 00:00:00 2001 From: Ed Page Date: Wed, 30 Oct 2024 11:21:53 -0500 Subject: [PATCH 2/2] docs(resolver): Simplify package.resolver default text --- src/doc/src/reference/resolver.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/doc/src/reference/resolver.md b/src/doc/src/reference/resolver.md index 9adea28e621..1ca87b15c05 100644 --- a/src/doc/src/reference/resolver.md +++ b/src/doc/src/reference/resolver.md @@ -503,7 +503,7 @@ name = "my-package" version = "1.0.0" resolver = "2" ``` -- `"1"` (workspace, [`edition = "2015"`](manifest.md#the-edition-field) default) +- `"1"` (default) - `"2"` ([`edition = "2021"`](manifest.md#the-edition-field) default): Introduces changes in [feature unification](#features). See the [features chapter][features-2] for more details.