File tree Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Expand file tree Collapse file tree 2 files changed +14
-1
lines changed Original file line number Diff line number Diff line change @@ -792,7 +792,9 @@ impl<'cfg> Workspace<'cfg> {
792792 if !manifest. patch ( ) . is_empty ( ) {
793793 emit_warning ( "patch" ) ?;
794794 }
795- if manifest. resolve_behavior ( ) != self . resolve_behavior {
795+ if manifest. resolve_behavior ( ) . is_some ( )
796+ && manifest. resolve_behavior ( ) != self . resolve_behavior
797+ {
796798 // Only warn if they don't match.
797799 emit_warning ( "resolver" ) ?;
798800 }
Original file line number Diff line number Diff line change @@ -1592,6 +1592,17 @@ fn resolver_enables_new_features() {
15921592 p. cargo ( "run --bin a" )
15931593 . masquerade_as_nightly_cargo ( )
15941594 . env ( "EXPECTED_FEATS" , "1" )
1595+ . with_stderr (
1596+ "\
1597+ [UPDATING] [..]
1598+ [DOWNLOADING] crates ...
1599+ [DOWNLOADED] common [..]
1600+ [COMPILING] common v1.0.0
1601+ [COMPILING] a v0.1.0 [..]
1602+ [FINISHED] [..]
1603+ [RUNNING] `target/debug/a[EXE]`
1604+ " ,
1605+ )
15951606 . run ( ) ;
15961607
15971608 // only normal+dev
You can’t perform that action at this time.
0 commit comments