Merge pull request #11 from gfx-rs/trunk

Updating to latest wgpu trunk

wgpu-core/src/track/mod.rs

@@ -308,7 +308,7 @@ impl<T: ResourceUses> fmt::Display for InvalidUse<T> {
         write!(
             f,
             "conflicting usages. Current usage {current:?} and new usage {new:?}. \
-            {exclusive:?} is an exclusive usage and cannot be used with any other\
+            {exclusive:?} is an exclusive usage and cannot be used with any other \
             usages within the usage scope (renderpass or compute dispatch)"
         )
     }

wgpu-hal/src/gles/egl.rs

@@ -393,7 +393,7 @@ impl AdapterContext {
     pub unsafe fn get_without_egl_lock(&self) -> MutexGuard<glow::Context> {
         self.glow
             .try_lock_for(Duration::from_secs(CONTEXT_LOCK_TIMEOUT_SECS))
-            .expect("Could not lock adapter context. This is most-likely a deadlcok.")
+            .expect("Could not lock adapter context. This is most-likely a deadlock.")
     }
 
     /// Obtain a lock to the EGL context and get handle to the [`glow::Context`] that can be used to
@@ -405,7 +405,7 @@ impl AdapterContext {
             // Don't lock forever. If it takes longer than 1 second to get the lock we've got a
             // deadlock and should panic to show where we got stuck
             .try_lock_for(Duration::from_secs(CONTEXT_LOCK_TIMEOUT_SECS))
-            .expect("Could not lock adapter context. This is most-likely a deadlcok.");
+            .expect("Could not lock adapter context. This is most-likely a deadlock.");
 
         let egl = self.egl.as_ref().map(|egl| {
             egl.make_current();