Skip to content

Commit 8b8a3a8

Browse files
committed
Detect actual edition/resolver for warning message
1 parent 2e2b3c1 commit 8b8a3a8

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/cargo/core/workspace.rs

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -995,18 +995,21 @@ impl<'cfg> Workspace<'cfg> {
995995
}
996996
if let MaybePackage::Virtual(vm) = self.root_maybe() {
997997
if vm.resolve_behavior().is_none() {
998-
if self
998+
if let Some(edition) = self
999999
.members()
10001000
.filter(|p| p.manifest_path() != root_manifest)
1001-
.any(|p| p.manifest().edition() >= Edition::Edition2021)
1001+
.map(|p| p.manifest().edition())
1002+
.filter(|&e| e >= Edition::Edition2021)
1003+
.max()
10021004
{
1005+
let resolver = edition.default_resolve_behavior().to_manifest();
10031006
self.config.shell().warn(
1004-
"\
1005-
some crates are on edition 2021 which defaults to `resolver = \"2\"`,\n\
1007+
format_args!("\
1008+
some crates are on edition {edition} which defaults to `resolver = \"{resolver}\"`,\n\
10061009
\x20 but a virtual workspace defaults to `resolver = \"1\"`\n\
10071010
\x20 specify the desired resolver version explicitly at the workspace root\
10081011
",
1009-
)?;
1012+
))?;
10101013
}
10111014
}
10121015
}

0 commit comments

Comments
 (0)