Skip to content

Skip invalid Rust toolchains instead of failing #1699

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

Merged
j178 merged 2 commits into from
Feb 27, 2026
Merged

Skip invalid Rust toolchains instead of failing #1699

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d25b6e5
Initial plan
Copilot Feb 27, 2026
30a9d81
Skip invalid Rust toolchains instead of failing
Copilot Feb 27, 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
26 changes: 20 additions & 6 deletions crates/prek/src/languages/rust/rustup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@ use std::path::{Path, PathBuf};
use std::sync::LazyLock;

use anyhow::{Context, Result};
use futures::{StreamExt, TryStreamExt};
use futures::StreamExt;
use prek_consts::env_vars::EnvVars;
use semver::Version;
use target_lexicon::HOST;
use tracing::{debug, trace};
use tracing::{debug, trace, warn};

use crate::fs::LockedFile;
use crate::languages::REQWEST_CLIENT;
Expand Down Expand Up @@ -182,8 +182,15 @@ impl Rustup {
let infos: Vec<ToolchainInfo> = futures::stream::iter(entries)
.map(async move |(name, path)| toolchain_info(name, path).await)
.buffer_unordered(8)
.try_collect()
.await?;
.filter_map(async move |result| match result {
Ok(info) => Some(info),
Err(e) => {
warn!("Skipping invalid toolchain: {e:#}");
None
}
})
.collect()
.await;

Ok(infos)
}
Expand All @@ -208,8 +215,15 @@ impl Rustup {
let infos: Vec<ToolchainInfo> = futures::stream::iter(entries)
.map(async move |(name, path)| toolchain_info(name, path).await)
.buffer_unordered(8)
.try_collect()
.await?;
.filter_map(async move |result| match result {
Ok(info) => Some(info),
Err(e) => {
warn!("Skipping invalid toolchain: {e:#}");
None
}
})
.collect()
.await;

Ok(infos)
}
Expand Down
Loading