Skip to content

fix(dist): fix unexpected downgrades without --allow-downgrade #5023

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rami3l wants to merge 9 commits into
base: main
Choose a base branch
from
+334 −290
Open

fix(dist): fix unexpected downgrades without --allow-downgrade #5023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
c6c2164
test(dist): show bug with `--allow-downgrade` in `rustup toolchain in…
rami3l Aug 19, 2026
36eb429
refactor(dist): simplify `DistOptions::install_into()`
rami3l Aug 19, 2026
080c9c2
refactor(dist): move `try_update_from_dist_()` to under `DistOptions`
rami3l Aug 19, 2026
45f3fb9
refactor(dist): simplify error handling in `DistOptions::try_update()`
rami3l Aug 26, 2026
d7d570c
refactor(dist): extract `DistOptions::dl_v2_manifest()`
rami3l Aug 19, 2026
d417455
refactor(dist): accept `Result<_>` as manifest in `DistOptions::try_u…
rami3l Aug 19, 2026
e77fea7
fix(dist): fix upgrading exit conditions in `DistOptions::install_int…
rami3l Aug 19, 2026
74b083c
refactor(dist): remove unused `fetched` param from `DistOptions::try_…
rami3l Aug 19, 2026
6fddede
feat(cli/rustup-mode): pass `--allow-downgrade` to `rustup update`
rami3l Aug 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/cli/rustup_mode.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,10 @@ enum RustupSubcmd {
#[arg(long)]
no_self_update: bool,

/// Allow downgrading the toolchain
#[arg(long)]
allow_downgrade: bool,

/// Force an update, even if some components are missing
#[arg(long)]
force: bool,
Expand Down Expand Up @@ -750,6 +754,7 @@ pub async fn main(
RustupSubcmd::Update {
toolchain,
no_self_update,
allow_downgrade,
force,
force_non_host,
} => {
Expand All @@ -758,6 +763,7 @@ pub async fn main(
UpdateOpts {
toolchain,
no_self_update,
allow_downgrade,
force,
force_non_host,
..UpdateOpts::default()
Expand Down
31 changes: 11 additions & 20 deletions src/dist/manifestation/tests.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ use url::Url;
use crate::{
Comment thread
rami3l marked this conversation as resolved.
config::Cfg,
dist::{
DEFAULT_DIST_SERVER, Profile, TargetTuple, ToolchainDesc,
DEFAULT_DIST_SERVER, DistOptions, Profile, TargetTuple, ToolchainDesc,
download::{DownloadCfg, DownloadTracker},
manifest::{Component, Manifest},
manifestation::{Changes, Manifestation, UpdateStatus},
Expand Down Expand Up @@ -1573,25 +1573,16 @@ async fn v2_manifest_checksum_mismatch_surfaces_error() {

let tp = TestProcess::new(env::current_dir().unwrap(), &["rustup"], vars, "");
let cfg = Cfg::from_env(tp.process.current_dir().unwrap(), false, true, &tp.process).unwrap();
let dl_cfg = DownloadCfg::new(&cfg);
let update_hash = cfg.get_hash_file(&cx.toolchain, true).unwrap();
let mut fetched = String::new();

let err = super::super::try_update_from_dist_(
&dl_cfg,
&update_hash,
&cx.toolchain,
Some(Profile::Default),
&cx.prefix,
false,
&[],
&[],
&mut fetched,
&cfg,
None,
)
.await
.unwrap_err();

let dist_opts =
DistOptions::new(&[], &[], &cx.toolchain, Profile::Default, false, &cfg).unwrap();
let manifest_result = dist_opts
.dl_v2_manifest(&cx.prefix, dist_opts.toolchain)
.await;
let err = dist_opts
.try_update(None, &cx.prefix, manifest_result)
.await
.unwrap_err();

match err.downcast_ref::<RustupError>() {
Some(RustupError::ChecksumFailed { .. }) => {}
Expand Down
Loading
Loading