From 2bcb5c92627030373972165dfa2a66b544f5019e Mon Sep 17 00:00:00 2001
From: daxpedda <daxpedda@gmail.com>
Date: Tue, 5 Mar 2024 10:28:31 +0100
Subject: [PATCH] Fix Web CI (#202)

---
 .github/workflows/ci.yml | 11 +++++++----
 src/backends/web.rs      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index af55c9c..c16bd5c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -87,14 +87,17 @@ jobs:
       if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
       run: sudo apt-get install gcc-multilib
 
+    - name: Pin deps that break MSRV
+      if: matrix.rust_version == '1.65.0'
+      run: |
+        cargo update -p exr --precise 1.71.0
+        cargo update -p ahash --precise 0.8.7
+        cargo update -p bumpalo --precise 3.14.0
+  
     - name: Build crate
       shell: bash
       run: cargo $CMD build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
 
-    - name: Pin versions of dev-deps
-      if: matrix.rust_version == '1.65.0'
-      run: cargo update -p exr --precise 1.71.0 && cargo update -p ahash --precise 0.8.7
-  
     - name: Build tests
       shell: bash
       if: >
diff --git a/src/backends/web.rs b/src/backends/web.rs
index 2b8e9b5..539e2d2 100644
--- a/src/backends/web.rs
+++ b/src/backends/web.rs
@@ -12,7 +12,6 @@ use web_sys::{OffscreenCanvas, OffscreenCanvasRenderingContext2d};
 use crate::backend_interface::*;
 use crate::error::{InitError, SwResultExt};
 use crate::{util, NoDisplayHandle, NoWindowHandle, Rect, SoftBufferError};
-use std::convert::TryInto;
 use std::marker::PhantomData;
 use std::num::NonZeroU32;
 
@@ -154,6 +153,7 @@ impl<D: HasDisplayHandle, W: HasWindowHandle> WebImpl<D, W> {
         );
 
         #[cfg(target_feature = "atomics")]
+        #[allow(non_local_definitions)]
         let result = {
             // When using atomics, the underlying memory becomes `SharedArrayBuffer`,
             // which can't be shared with `ImageData`.