mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bootstrap: config: fix version comparison bug

Browse Source 
Rust requires a previous version of Rust to build, such as the current version, or the
previous version.  However, the version comparison logic did not take patch releases
into consideration when doing the version comparison for the current branch, e.g.
Rust 1.71.1 could not be built by Rust 1.71.0 because it is neither an exact version
match, or the previous version.

Adjust the version comparison logic to tolerate mismatches in the patch version.

Signed-off-by: Ariadne Conill <ariadne@dereferenced.org>
This commit is contained in:
Ariadne Conill 2023-08-03 15:05:40 -07:00
parent defed6257a
commit 31a81a0878
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/bootstrap/config.rs
View File

@ -2004,7 +2004,8 @@ impl Config {
.unwrap(); .unwrap();
if !(source_version == rustc_version if !(source_version == rustc_version
|| (source_version.major == rustc_version.major || (source_version.major == rustc_version.major
&& source_version.minor == rustc_version.minor + 1)) && (source_version.minor == rustc_version.minor
|| source_version.minor == rustc_version.minor + 1)))
{ {
let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1); let prev_version = format!("{}.{}.x", source_version.major, source_version.minor - 1);
eprintln!( eprintln!(