File tree Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Expand file tree Collapse file tree 2 files changed +9
-3
lines changed Original file line number Diff line number Diff line change @@ -73,7 +73,6 @@ use crate::util::cache_lock::CacheLockMode;
73
73
use crate :: util:: errors:: CargoResult ;
74
74
use crate :: util:: CanonicalUrl ;
75
75
use anyhow:: Context as _;
76
- use cargo_util_schemas:: manifest:: RustVersion ;
77
76
use std:: collections:: { HashMap , HashSet } ;
78
77
use tracing:: { debug, trace} ;
79
78
@@ -304,8 +303,14 @@ pub fn resolve_with_previous<'gctx>(
304
303
version_prefs. version_ordering ( VersionOrdering :: MinimumVersionsFirst )
305
304
}
306
305
if ws. resolve_honors_rust_version ( ) {
307
- let rust_version = ws. rust_version ( ) . cloned ( ) . map ( RustVersion :: into_partial) ;
308
- version_prefs. max_rust_version ( rust_version) ;
306
+ let rust_version = if let Some ( ver) = ws. rust_version ( ) {
307
+ ver. clone ( ) . into_partial ( )
308
+ } else {
309
+ let rustc = ws. gctx ( ) . load_global_rustc ( None ) ?;
310
+ let rustc_version = rustc. version . clone ( ) . into ( ) ;
311
+ rustc_version
312
+ } ;
313
+ version_prefs. max_rust_version ( Some ( rust_version) ) ;
309
314
}
310
315
311
316
let avoid_patch_ids = if register_patches {
Original file line number Diff line number Diff line change @@ -414,6 +414,7 @@ fn resolve_with_rustc() {
414
414
"\
415
415
[UPDATING] `dummy-registry` index
416
416
[LOCKING] 2 packages
417
+ [ADDING] bar v1.5.0 (latest: v1.6.0)
417
418
" ,
418
419
)
419
420
. run ( ) ;
You can’t perform that action at this time.
0 commit comments