Skip to content

Commit

Permalink
Mention workspace root's manifest explicitly
Browse files Browse the repository at this point in the history
  • Loading branch information
Nemo157 committed May 26, 2023
1 parent 8b8a3a8 commit 620f66f
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/cargo/core/workspace.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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\
",
))?;
}
Expand Down
2 changes: 1 addition & 1 deletion tests/testsuite/features2.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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] [..]
",
Expand Down

0 comments on commit 620f66f

Please sign in to comment.