I'm not able to fix the following error: error[E0308]: `match` arms have incompatible types --> /wrkdirs/usr/ports/devel/git-branchless/work/git-branchless-0.10.0/cargo-crates/esl01-indexedlog-0.3.0/src/lock.rs:138:30 | 134 | / match (opts.exclusive, opts.non_blocking) { 135 | | (true, false) => file.lock_exclusive(), | | --------------------- this is found to be of type `std::result::Result<(), std::io::Error>` 136 | | (true, true) => file.try_lock_exclusive(), | | ------------------------- this is found to be of type `std::result::Result<(), std::io::Error>` 137 | | (false, false) => file.lock_shared(), | | ------------------ this is found to be of type `std::result::Result<(), std::io::Error>` 138 | | (false, true) => file.try_lock_shared(), | | ^^^^^^^^^^^^^^^^^^^^^^ expected `Result<(), Error>`, found `Result<(), TryLockError>` 139 | | } | |_________- `match` arms have incompatible types
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=59148195cf66cba52e039ec29370d7bd6f782a4e commit 59148195cf66cba52e039ec29370d7bd6f782a4e Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2025-08-31 14:52:58 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2025-09-01 08:24:02 +0000 devel/git-branchless: Use rust 1.88.0 git-branchless doesn't build with rust 1.89.0 error[E0308]: `match` arms have incompatible types --> cargo-crates/esl01-indexedlog-0.3.0/src/lock.rs:138: PR: 289015 devel/git-branchless/Makefile | 4 ++++ 1 file changed, 4 insertions(+)
A commit in branch main references this bug: URL: https://cgit.FreeBSD.org/ports/commit/?id=c61dde399b03b25692b6eab7dda0556fbccc48a5 commit c61dde399b03b25692b6eab7dda0556fbccc48a5 Author: Mikael Urankar <mikael@FreeBSD.org> AuthorDate: 2025-08-31 11:13:05 +0000 Commit: Mikael Urankar <mikael@FreeBSD.org> CommitDate: 2025-09-01 08:24:01 +0000 lang/rust: fork 1.88 into a pinned port A temporary workaround for devel/git-branchless and games/veloren-weekly. PR: 288923, 289015, 289016 lang/Makefile | 1 + lang/rust-nightly/Makefile | 2 +- lang/rust/Makefile | 2 +- lang/rust188/Makefile (new) | 283 ++++++++ lang/rust188/distinfo (new) | 51 ++ ...ustc__driver__impl_src_signal__handler.rs (new) | 28 + ...er_rustc__target_src_spec_base_freebsd.rs (new) | 11 + ...rc_spec_targets_i686__unknown__freebsd.rs (new) | 13 + ...r_rustc__target_src_callconv_powerpc64.rs (new) | 11 + ...ch-library_backtrace_src_backtrace_mod.rs (new) | 10 + ...ootstrap_src_core_build__steps_install.rs (new) | 17 + ...ols_cargo_src_cargo_sources_git_source.rs (new) | 36 + lang/rust188/files/patch-vendor_cc.rs (new) | 75 +++ .../patch-vendor_git2-0.19.0_src_lib.rs (new) | 18 + lang/rust188/files/patch-vendor_libc-0.2.155 (new) | 745 +++++++++++++++++++++ ...-vendor_openssl_crypto_threads__pthread.c (new) | 27 + ...t_src_spec_riscv64gc__unknown__freebsd.rs (new) | 21 + lang/rust188/pkg-descr (new) | 12 + lang/rust188/update.sh (new) | 35 + 19 files changed, 1396 insertions(+), 2 deletions(-)
I haven't tried but there is a patch in nixos repo: https://github.com/NixOS/nixpkgs/pull/437517/files
Created attachment 264684 [details] patch
(In reply to Mikael Urankar from comment #3) Good find, it works. I attached a patch.
^Triage: is this Problem Report obsoleted by commit https://cgit.freebsd.org/ports/commit/devel/git-branchless/Makefile?id=cd166828da863be8369c816c8ba5ed1ea63be002 ?
(In reply to Mark Linimon from comment #6) yes, confirmed it builds with 1.96.1