From 620f66fa922bf7e41fd83dd4eba51394f3493399 Mon Sep 17 00:00:00 2001 From: Wim Looman Date: Fri, 26 May 2023 16:41:04 +0200 Subject: [PATCH] Mention workspace root's manifest explicitly --- src/cargo/core/workspace.rs | 2 +- tests/testsuite/features2.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargo/core/workspace.rs b/src/cargo/core/workspace.rs index 7a0415452c0..af010d89cac 100644 --- a/src/cargo/core/workspace.rs +++ b/src/cargo/core/workspace.rs @@ -1007,7 +1007,7 @@ impl<'cfg> Workspace<'cfg> { format_args!("\ some crates are on edition {edition} which defaults to `resolver = \"{resolver}\"`,\n\ \x20 but a virtual workspace defaults to `resolver = \"1\"`\n\ - \x20 specify the desired resolver version explicitly at the workspace root\ + \x20 specify the desired resolver version explicitly in the workspace root's manifest\ ", ))?; } diff --git a/tests/testsuite/features2.rs b/tests/testsuite/features2.rs index 188f5bb07e9..9a6a541edb0 100644 --- a/tests/testsuite/features2.rs +++ b/tests/testsuite/features2.rs @@ -1433,7 +1433,7 @@ fn edition_2021_workspace_member() { "\ warning: some crates are on edition 2021 which defaults to `resolver = \"2\"`, but a virtual workspace defaults to `resolver = \"1\"` - specify the desired resolver version explicitly at the workspace root + specify the desired resolver version explicitly in the workspace root's manifest [CHECKING] a v0.1.0 [..] [FINISHED] [..] ",