Re: pkgsrc firefox91 - rust-fu needed for borrowed value

[David Brownlee <abs%absd.org@localhost>]

Indeed it does - many thanks, patch committed!

Where do I send the beer? :)

David

On Fri, 9 Dec 2022 at 20:07, Adam <adam%netbsd.org@localhost> wrote:
>
> Scratch my last email. This should fix the problem. Please, test.
>
> Adam
>
>
>
> % pkgdiff firefox-91.13.0/gfx/wgpu/wgpu-core/src/device/mod.rs
> $NetBSD$
>
> https://github.com/gfx-rs/wgpu/pull/2967
>
> --- firefox-91.13.0/gfx/wgpu/wgpu-core/src/device/mod.rs.orig   2022-12-09 20:04:10.000000000 +0000
> +++ firefox-91.13.0/gfx/wgpu/wgpu-core/src/device/mod.rs
> @@ -1486,6 +1486,7 @@ impl<B: GfxBackend> Device<B> {
>
>          // `BTreeMap` has ordered bindings as keys, which allows us to coalesce
>          // the descriptor writes into a single transaction.
> +        let mut desc_set; // early declaration so it's dropped after write_map
>          let mut write_map = BTreeMap::new();
>          let mut used_buffer_ranges = Vec::new();
>          for entry in desc.entries.iter() {
> @@ -1779,7 +1780,7 @@ impl<B: GfxBackend> Device<B> {
>              self.desc_allocator
>                  .lock()
>                  .allocate(&self.raw, &layout.raw, &layout.desc_count, 1)?;
> -        let mut desc_set = desc_sets.pop().unwrap();
> +        desc_set = desc_sets.pop().unwrap();
>
>          // Set the descriptor set's label for easier debugging.
>          if let Some(label) = desc.label.as_ref() {
>
>
>
>