From a9a387673f027bf66fb5d42c9bc4d570ecc3128a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20Puk=C5=A1ta?= Date: Thu, 23 Apr 2026 14:58:09 +0300 Subject: [PATCH 1/3] fix(ci): disable failing job MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrius Pukšta --- .github/workflows/python.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/python.yml b/.github/workflows/python.yml index 3b06efcb..78cc80dd 100644 --- a/.github/workflows/python.yml +++ b/.github/workflows/python.yml @@ -70,9 +70,11 @@ jobs: - runner: windows-latest target: x64 rust_target: x86_64-pc-windows-msvc - - runner: windows-11-arm - target: arm64 # not aarch64 because expected by setup-python - rust_target: aarch64-pc-windows-msvc + # arm64 fails in setup-python, see + # https://github.com/actions/partner-runner-images/issues/154 + # - runner: windows-11-arm + # target: arm64 # not aarch64 because expected by setup-python + # rust_target: aarch64-pc-windows-msvc # It is sufficient to build wheels for the lowest supported Python # version, but we need to build wheels for each supported free-threaded # version. From d0531eece14c6f66b9f1fe717270f5afed5638c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20Puk=C5=A1ta?= Date: Thu, 23 Apr 2026 15:13:51 +0300 Subject: [PATCH 2/3] chore: bump Rust toolchain, run prek MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrius Pukšta --- core/src/auth.rs | 7 +------ core/src/project/mod.rs | 2 +- rust-toolchain.toml | 2 +- sysand/src/commands/add.rs | 10 +++------- 4 files changed, 6 insertions(+), 15 deletions(-) diff --git a/core/src/auth.rs b/core/src/auth.rs index 7714e11e..4b5ffc3b 100644 --- a/core/src/auth.rs +++ b/core/src/auth.rs @@ -427,12 +427,7 @@ impl StandardHTTPAuthentication { // `GlobMap` stores keys and values in parallel vectors; consume `self` so we // can move bearer tokens into a publish-only map without cloning secrets. - for (key, sequence_auth) in self - .restricted - .keys - .into_iter() - .zip(self.restricted.values.into_iter()) - { + for (key, sequence_auth) in self.restricted.keys.into_iter().zip(self.restricted.values) { if let StandardInnerAuthentication::BearerAuth(inner) = sequence_auth.lower { partial.add(key, inner); } diff --git a/core/src/project/mod.rs b/core/src/project/mod.rs index 0b7dfdc9..f9bbae73 100644 --- a/core/src/project/mod.rs +++ b/core/src/project/mod.rs @@ -541,7 +541,7 @@ pub trait ProjectReadAsync { }); let collected_checksums: Result, _> = - futures::future::join_all(future_checksums.into_iter()) + futures::future::join_all(future_checksums) .await .into_iter() .collect(); diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 3c5fd85b..2b3156a2 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -8,6 +8,6 @@ # - Check latest stable version: rustup check # [toolchain] -channel = "1.94" +channel = "1.95" components = [ "rustfmt", "clippy" ] profile = "minimal" diff --git a/sysand/src/commands/add.rs b/sysand/src/commands/add.rs index 0258f5de..00dfbe98 100644 --- a/sysand/src/commands/add.rs +++ b/sysand/src/commands/add.rs @@ -190,13 +190,9 @@ pub fn command_add( if !no_lock { let info_path = current_project.info_path(); let info_backup = wrapfs::read_to_string(&info_path)?; - match do_add(&mut current_project, &usage_raw) { - Ok(added) => { - if !added { - return Ok(()); - } - } - Err(e) => return Err(e.into()), + let added = do_add(&mut current_project, &usage_raw)?; + if !added { + return Ok(()); } let alias_iris = if let Some(w) = &ctx.current_workspace { From 0a8e8d8c5bb6229988dbaa0499e6558bb500d0a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrius=20Puk=C5=A1ta?= Date: Thu, 23 Apr 2026 15:29:56 +0300 Subject: [PATCH 3/3] chore: remove comment, resolved by upstream MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Andrius Pukšta --- core/src/solve/pubgrub.rs | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/src/solve/pubgrub.rs b/core/src/solve/pubgrub.rs index b584c269..9494b31e 100644 --- a/core/src/solve/pubgrub.rs +++ b/core/src/solve/pubgrub.rs @@ -338,8 +338,6 @@ fn compute_deps( } } - // TODO: replace this with `from(deps)` when https://github.com/pubgrub-rs/pubgrub/pull/423 - // is merged and released let constraints = DependencyConstraints::from_iter(deps); Ok(pubgrub::Dependencies::Available(constraints)) }