Merge #1237

1237: Move `#[error]` attributes after the corresponding `#[derive]` r=kvark a=Aaron1011 **Connections** See rust-lang/rust#79202 **Description** Fixes Nightly future-incompat warnings **Testing** There are no behavior changes intended. Co-authored-by: Aaron Hill <[email protected]>
gfx-rs · Feb 26, 2021 · 29058e0 · 29058e0
2 parents 39aa01d + 12b086d
commit 29058e0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/wgpu-core/src/device/mod.rs b/wgpu-core/src/device/mod.rs
@@ -2507,8 +2507,8 @@ impl<B: hal::Backend> crate::hub::Resource for Device<B> {
     }
 }
 
-#[error("device is invalid")]
 #[derive(Clone, Debug, Error)]
+#[error("device is invalid")]
 pub struct InvalidDevice;
 
 #[derive(Clone, Debug, Error)]

diff --git a/wgpu-core/src/device/queue.rs b/wgpu-core/src/device/queue.rs
@@ -148,8 +148,8 @@ impl<B: hal::Backend> super::Device<B> {
     }
 }
 
-#[error("queue is invalid")]
 #[derive(Clone, Debug, Error)]
+#[error("queue is invalid")]
 pub struct InvalidQueue;
 
 #[derive(Clone, Debug, Error)]

diff --git a/wgpu-core/src/instance.rs b/wgpu-core/src/instance.rs
@@ -557,8 +557,8 @@ impl<I: Clone> AdapterInputs<'_, I> {
     }
 }
 
-#[error("adapter is invalid")]
 #[derive(Clone, Debug, Error)]
+#[error("adapter is invalid")]
 pub struct InvalidAdapter;
 
 #[derive(Clone, Debug, Error)]