Final tweaks: use expect and remove unnecessary crate attributes

servo · Jul 4, 2019 · 208473c · 208473c
1 parent 63920da
commit 208473c
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 55 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/constellation/constellation.rs b/components/constellation/constellation.rs
@@ -464,7 +464,7 @@ pub struct InitialConstellationState {
 
     /// The XR device registry
     pub webxr_registry: webxr_api::Registry,
-    
+
     pub glplayer_threads: Option<GLPlayerThreads>,
 
     /// Application window's GL Context for Media player

diff --git a/components/constellation/pipeline.rs b/components/constellation/pipeline.rs
@@ -192,7 +192,7 @@ pub struct InitialPipelineState {
 
     /// The XR device registry
     pub webxr_registry: webxr_api::Registry,
-    
+
     /// Application window's GL Context for Media player
     pub player_context: WindowGLContext,
 }

diff --git a/components/media/lib.rs b/components/media/lib.rs
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "media"]
-#![crate_type = "rlib"]
 #![deny(unsafe_code)]
 
 #[macro_use]

diff --git a/components/webrender_traits/lib.rs b/components/webrender_traits/lib.rs
@@ -2,8 +2,6 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
-#![crate_name = "webrender_traits"]
-#![crate_type = "rlib"]
 #![deny(unsafe_code)]
 
 use euclid::Size2D;
@@ -110,56 +108,42 @@ impl webrender::ExternalImageHandler for WebrenderExternalImageHandlers {
         _channel_index: u8,
         _rendering: webrender_api::ImageRendering,
     ) -> webrender::ExternalImage {
-        if let Some(handler_type) = self.external_images.lock().unwrap().get(&key) {
-            let (texture_id, uv) = match handler_type {
-                WebrenderImageHandlerType::WebGL => {
-                    let (texture_id, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
-                    (
-                        texture_id,
-                        webrender_api::TexelRect::new(
-                            0.0,
-                            size.height as f32,
-                            size.width as f32,
-                            0.0,
-                        ),
-                    )
-                },
-                WebrenderImageHandlerType::Media => {
-                    let (texture_id, size) = self.media_handler.as_mut().unwrap().lock(key.0);
-                    (
-                        texture_id,
-                        webrender_api::TexelRect::new(
-                            0.0,
-                            0.0,
-                            size.width as f32,
-                            size.height as f32,
-                        ),
-                    )
-                },
-            };
-            webrender::ExternalImage {
-                uv,
-                source: webrender::ExternalImageSource::NativeTexture(texture_id),
-            }
-        } else {
-            unreachable!()
+        let external_images = self.external_images.lock().unwrap();
+        let handler_type = external_images
+            .get(&key)
+            .expect("Tried to get unknown external image");
+        let (texture_id, uv) = match handler_type {
+            WebrenderImageHandlerType::WebGL => {
+                let (texture_id, size) = self.webgl_handler.as_mut().unwrap().lock(key.0);
+                (
+                    texture_id,
+                    webrender_api::TexelRect::new(0.0, size.height as f32, size.width as f32, 0.0),
+                )
+            },
+            WebrenderImageHandlerType::Media => {
+                let (texture_id, size) = self.media_handler.as_mut().unwrap().lock(key.0);
+                (
+                    texture_id,
+                    webrender_api::TexelRect::new(0.0, 0.0, size.width as f32, size.height as f32),
+                )
+            },
+        };
+        webrender::ExternalImage {
+            uv,
+            source: webrender::ExternalImageSource::NativeTexture(texture_id),
         }
     }
 
     /// Unlock the external image. The WR should not read the image
     /// content after this call.
     fn unlock(&mut self, key: webrender_api::ExternalImageId, _channel_index: u8) {
-        if let Some(handler_type) = self.external_images.lock().unwrap().get(&key) {
-            match handler_type {
-                WebrenderImageHandlerType::WebGL => {
-                    self.webgl_handler.as_mut().unwrap().unlock(key.0)
-                },
-                WebrenderImageHandlerType::Media => {
-                    self.media_handler.as_mut().unwrap().unlock(key.0)
-                },
-            };
-        } else {
-            unreachable!();
-        }
+        let external_images = self.external_images.lock().unwrap();
+        let handler_type = external_images
+            .get(&key)
+            .expect("Tried to get unknown external image");
+        match handler_type {
+            WebrenderImageHandlerType::WebGL => self.webgl_handler.as_mut().unwrap().unlock(key.0),
+            WebrenderImageHandlerType::Media => self.media_handler.as_mut().unwrap().unlock(key.0),
+        };
     }
 }