From b76b81d9faead4e1f270655dbb382472dd6adc44 Mon Sep 17 00:00:00 2001
From: kyren <kerriganw@gmail.com>
Date: Sat, 25 May 2019 16:03:57 -0400
Subject: [PATCH] [rs] Fix merge snafu

---
 wgpu/src/lib.rs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/wgpu/src/lib.rs b/wgpu/src/lib.rs
index 1e8d926c7d..ba55d63b9b 100644
--- a/wgpu/src/lib.rs
+++ b/wgpu/src/lib.rs
@@ -465,6 +465,13 @@ impl Instance {
         }
     }
 
+    #[cfg(feature = "gl")]
+    pub fn new(windowed_context: wgn::glutin::WindowedContext) -> Self {
+        Instance {
+            id: wgn::wgpu_create_gl_instance(windowed_context)
+        }
+    }
+
     /// Retrieves an [`Adapter`] which matches the given descriptor.
     ///
     /// If there are no available adapters matching `desc`, this function will return another
@@ -474,13 +481,6 @@ impl Instance {
     ///
     /// Panics if there are no available adapters. This will occur if none of the graphics backends
     /// are enabled.
-    #[cfg(feature = "gl")]
-    pub fn new(windowed_context: wgn::glutin::WindowedContext) -> Self {
-        Instance {
-            id: wgn::wgpu_create_gl_instance(windowed_context)
-        }
-    }
-
     pub fn get_adapter(&self, desc: &AdapterDescriptor) -> Adapter {
         Adapter {
             id: wgn::wgpu_instance_get_adapter(self.id, desc),