Fails to build with rust 1.89.0

[yurivict]

Description of the bug

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

Downstream bug report.

Version: 0.10.0
FreeBSD 14.3

Expected behavior

No response

Actual behavior

No response

Version of rustc

No response

Automated bug report

No response

Version of git-branchless

No response

Version of git

No response

[2shaar2059]

I am also getting this error.

[KudoLayton]

I think https://crates.io/crates/esl01-indexedlog crate causes the error.
The last commit of the crate has been done FOUR YEARS ago

[claytonrcarter]

Thanks for the report. It looks like this has already been fixed upstream, but has not been released/published in a crate yet. I've opened facebook/sapling#1119 to request an updated crate.

Until then, I'll note that our current MSRV is still 1.74: https://github.com/arxanas/git-branchless/blob/master/git-branchless/Cargo.toml#L14

[arxanas]

• For this specific case, I believe the maintained version of this crate is sapling-dag. We should try migrating, but I believe there were some breakages that would need to be resolved.
• Generally, I don't recall if we had explicitly made the decision to specifically follow either clap or jj's MSRV. jj probably makes sense?
• [tangential] It doesn't seem to help to run nightly Clippy on normal CI. It mostly blocks otherwise-passing CI runs. We should probably just drop it in favor of stable Clippy.

[k0tran]

How long until it's going to be released? Looking to fix FTBFS on our rolling distro (https://packages.altlinux.org/en/sisyphus/srpms/git-branchless/)
master (1eb0f7e) already builds with rust 1.89.0 on my machine

[claytonrcarter]

Interesting, I was under the impression that the released version of sapling-dag predated the Rust 1.89-related updates, but it does seem to build fine w/ 1.89 on master now that d8238ff is in place. 🤷

I don't think we're in a rush to release. As noted above, MSRV for v0.10 is still 1.74, which still builds just fine. That said, I think we're probably getting close to a threshold of changes that warrants a new release. No promises, though! 😄