Update dependencies #765
Update dependencies #765
Conversation
| @@ -1,4 +1,5 @@ | |||
| [workspace] | |||
| resolver = "2" | |||
There was a problem hiding this comment.
Note to self: we should make compiletests depend on spirv-builder as a build dep (and get access to rustc_codegen_spirv that way), as I believe that with resolver = "2" it's even harder to deduplicate between build-dependencies and dependencies (and we're probably building rustc_codegen_spirv at least twice on CI now).
examples/runners/ash/Cargo.toml
Outdated
| # TODO: Remove this once no longer needed, only needed to make cargo-deny happy for some reason. | ||
| nix = "0.20.2" |
There was a problem hiding this comment.
Can you link https://rustsec.org/advisories/RUSTSEC-2021-0119 in the comment? My understanding is that this is what cargo-deny is complaining about.
Also, there's an even more cursed situation, but about a different minor version of nix (so we're not hitting it yet): there's a bitflags "impossible to satisfy" constraint with certain combinations of deps, because nix decided to limit the maximum bitflags version in 0.22.1 (in a misguided attempt at preserving a relation between MSRV and semver) but then 0.22.2 had to be released to deal with the RUSTSEC advisory issue, and so an upgrade to the impossible situation is forced.
There was a problem hiding this comment.
Yeah, it's that rustsec advisory. The reason it's needed, I thiiiink (not confident enough to put this into a comment), is that cargo's resolver prefers the combination of bitflags 1.3.2, nix 0.20.0, nix 0.22.0 over bitflags 1.2.1, nix 0.20.2, nix 0.22.2. Specifying nix = "0.20.2" forces cargo to downgrade bitflags to 1.2.1, and allows nix to be upgraded out of the RUSTSEC issue.
(in our crate graph, nix 0.22 is depended on by calloop, and nix 0.20 is depended on by various wayland stuffs)
| if let Some(swap_chain) = &mut swap_chain { | ||
| let frame = swap_chain | ||
| .get_current_frame() | ||
| .expect("Failed to acquire next swap chain texture") | ||
| .output; | ||
| if let Some(surface) = &mut surface { | ||
| let output = match surface.get_current_texture() { | ||
| Ok(surface) => surface, |
There was a problem hiding this comment.
Interesting, has "swap chain" terminology been removed from wgpu? I like the "surface" replacement.
Could you also rename swapchain_format to surface_format, or some other name? To avoid any future confusion.
|
I said this in discord already, but to add context where it's relevant, this is currently blocked on EmbarkStudios/ash-molten#56 getting merged - I'd rather not reference a git fork. Either ash-molten will do another release once that's merged, or we can reference ash-molten git main. This is because ash 0.32 has cargo-deny issues, so, need to update to ash 0.33, but ash-molten doesn't have support for ash 0.33 yet (that PR adds it). |
It's merged now so yall should be unblocked now when a release is made 馃コ
We should have probably backported the fix to a 0.32 release to make the transition smoother... Oh well upgrading to 0.33 isn't too bad either 馃檪 |
No description provided.