Skip to content
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

build(deps): bump the cargo-minor group across 1 directory with 6 updates #18617

Closed
wants to merge 1 commit into from
Closed

build(deps): bump the cargo-minor group across 1 directory with 6 updates #18617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
85 changes: 40 additions & 45 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
naga = { version = "23.0.0", features = ["wgsl-out"] }
wgpu = "23.0.0"
egui = { git = "https://github.com/emilk/egui.git", branch = "master" }
clap = { version = "4.5.20", features = ["derive"] }
clap = { version = "4.5.21", features = ["derive"] }
cpal = "0.15.3"
anyhow = "1.0"
slotmap = "1.0.7"
Expand All @@ -60,22 +60,22 @@ bitflags = "2.6.0"
bytemuck = "1.19.0"
chrono = { version = "0.4.38", default-features = false }
enum-map = "2.7.3"
flate2 = "1.0.34"
flate2 = "1.0.35"
futures = "0.3.31"
image = { version = "0.25.5", default-features = false }
js-sys = "0.3.72"
web-sys = "0.3.72"
log = "0.4"
num-derive = "0.4.2"
num-traits = "0.2.19"
serde = "1.0.214"
serde = "1.0.215"
thiserror = "1.0"
url = "2.5.2"
# Make sure to match wasm-bindgen-cli version to this everywhere.
wasm-bindgen = "=0.2.95"
walkdir = "2.5.0"
tokio = "1.41.1"
rfd = "0.15.0"
rfd = "0.15.1"

[workspace.lints.rust]
# Clippy nightly often adds new/buggy lints that we want to ignore.
Expand Down
4 changes: 3 additions & 1 deletion desktop/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,9 @@ rand = "0.8.5"
thiserror.workspace = true

[target.'cfg(target_os = "linux")'.dependencies]
ashpd = "0.9.2"
# The `tokio` and `async-std` features are mutually exclusive, and `ashpd` itself enables `tokio`
# by default, while `rfd` enables `async-std` for it by default. So we need to disable `tokio` here.
ashpd = { version = "0.10.2", default-features = false }
Comment on lines 54 to +57
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or should it be the other way around: Disable async-std and use tokio? Does it matter? I dunno... @kjarosh ?

See:
https://github.com/PolyMeilex/rfd/blob/5cb7002452da5d583f580c50f9753bc97117b1c7/Cargo.toml#L13-L21
https://github.com/bilelmoussaoui/ashpd/blob/62954f769c1ee7731fb59ed3a3d15c0410b82d2c/Cargo.toml#L14-L26
https://github.com/bilelmoussaoui/ashpd/blob/62954f769c1ee7731fb59ed3a3d15c0410b82d2c/src/lib.rs#L9-L10

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good question... I see it's mainly used for IO stuff, i.e. detecting Flatpak. So maybe running this inside+outside of Flatpak and checking whether it works is enough

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

To be sure, which one have we been using by default until now?

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference: #18645 (comment)


[target.'cfg(windows)'.dependencies]
winapi = "0.3.9"
Expand Down