[GPUI] Dependency conflict for futures-lite

[ndunnett]

Summary

There is a dependency conflict since switching back to upstream oo7 74d1a65. I've encountered this today while updating my toy calculator to the latest GPUI commit.

> cargo build
    Updating git repository `https://github.com/zed-industries/zed`
    Updating crates.io index
error: failed to select a version for `futures-lite`.
    ... required by package `oo7 v0.4.0`
    ... which satisfies dependency `oo7 = "^0.4.0"` of package `gpui v0.1.0 (...)`
    ... which satisfies git dependency `gpui` of package `gpui-calc v0.1.0 (...)`
versions that meet the requirements `^2.6` are: 2.6.0

all possible versions conflict with previously selected packages.

  previously selected package `futures-lite v2.5.0`
    ... which satisfies dependency `futures-lite = "^2.0.0"` (locked to 2.5.0) of package `async-fs v2.1.2`
    ... which satisfies dependency `async-fs = "^2.1.0"` (locked to 2.1.2) of package `oo7 v0.4.0`
    ... which satisfies dependency `oo7 = "^0.4.0"` of package `gpui v0.1.0 (...)`
    ... which satisfies git dependency `gpui` of package `gpui-calc v0.1.0 (...)`

failed to select a version for `futures-lite` which could resolve this conflict

Looks the versions GPUI have pinned of async-fs and oo7 have pinned conflicting versions of futures-lite:

oo7 0.4.0 Cargo.toml:

[workspace.dependencies]
...
futures-lite = "2.6"

async-fs 2.1.2 Cargo.toml:

[dependencies]
...
futures-lite = "2.0.0"

Zed Version and System Specs

GPUI 74d1a65
cargo/rustc 1.87.0-nightly
Windows 11