File tree 1 file changed +8
-5
lines changed 1 file changed +8
-5
lines changed Original file line number Diff line number Diff line change @@ -995,18 +995,21 @@ impl<'cfg> Workspace<'cfg> {
995
995
}
996
996
if let MaybePackage :: Virtual ( vm) = self . root_maybe ( ) {
997
997
if vm. resolve_behavior ( ) . is_none ( ) {
998
- if self
998
+ if let Some ( edition ) = self
999
999
. members ( )
1000
1000
. 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 ( )
1002
1004
{
1005
+ let resolver = edition. default_resolve_behavior ( ) . to_manifest ( ) ;
1003
1006
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 \
1006
1009
\x20 but a virtual workspace defaults to `resolver = \" 1\" `\n \
1007
1010
\x20 specify the desired resolver version explicitly at the workspace root\
1008
1011
",
1009
- ) ?;
1012
+ ) ) ?;
1010
1013
}
1011
1014
}
1012
1015
}
You can’t perform that action at this time.
0 commit comments