Fix cargo check --all-features build

Looks like this was broken by my recent changes.
servo · Feb 29, 2024 · c1dbab1 · c1dbab1
1 parent a77995f
commit c1dbab1
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/examples/player/app.rs b/examples/player/app.rs
@@ -28,7 +28,7 @@ struct SMError(std::string::String);
 
 #[derive(Debug, Fail)]
 #[fail(display = "Error: {}", _0)]
-struct MiscError(&'static str);
+struct MiscError(std::string::String);
 
 #[path = "renderer.rs"]
 mod renderer;
@@ -185,7 +185,7 @@ impl App {
         // player
         let (player_event_sender, player_event_receiver) = ipc::channel::<player::PlayerEvent>()?;
         let servo_media =
-            ServoMedia::get().map_err(|error| MiscError(format!("Failed to get media backend: {error:?}").as_str()))?;
+            ServoMedia::get().map_err(|error| MiscError(format!("Failed to get media backend: {error:?}")))?;
 
         let frame_renderer = if !opts.no_video {
             Some(Arc::new(Mutex::new(MediaFrameRenderer::new(
@@ -219,7 +219,7 @@ impl App {
             .lock()
             .unwrap()
             .set_input_size(metadata.len())
-            .map_err(|error| MiscError(format!("Failed to set media input size: {error:?}").as_str()))?;
+            .map_err(|error| MiscError(format!("Failed to set media input size: {error:?}")))?;
 
         Ok(App {
             events_loop,
@@ -252,7 +252,7 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
     let window_size = windowed_context
         .window()
         .get_inner_size()
-        .ok_or_else(|| MiscError("Failed to get window inner size"))?;
+        .ok_or_else(|| MiscError("Failed to get window inner size".to_owned()))?;
     let mut framebuffer_size = {
         let glutin::dpi::PhysicalSize { width, height } =
             window_size.to_physical(device_pixel_ratio as f64);
@@ -283,7 +283,7 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
         .lock()
         .unwrap()
         .play()
-        .map_err(|error| MiscError(format!("Failed to start player: {error:?}").as_str()))?;
+        .map_err(|error| MiscError(format!("Failed to start player: {error:?}")))?;
 
     let mut running = true;
     let mut input_eos = false;
@@ -338,22 +338,22 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
                     .lock()
                     .unwrap()
                     .stop()
-                    .map_err(|error| MiscError(format!("Failed to stop player: {error:?}").as_str()))?;
+                    .map_err(|error| MiscError(format!("Failed to stop player: {error:?}")))?;
                 input_eos = true;
             }
             PlayerCmd::Pause => {
                 player
                     .lock()
                     .unwrap()
                     .pause()
-                    .map_err(|error| MiscError(format!("Failed to pause player: {error:?}").as_str()))?;
+                    .map_err(|error| MiscError(format!("Failed to pause player: {error:?}")))?;
             }
             PlayerCmd::Play => {
                 player
                     .lock()
                     .unwrap()
                     .play()
-                    .map_err(|error| MiscError(format!("Failed to start player: {error:?}").as_str()))?;
+                    .map_err(|error| MiscError(format!("Failed to start player: {error:?}")))?;
             }
             PlayerCmd::Seek(time) => {
                 let time = playerstate.pos + time;
@@ -365,15 +365,15 @@ pub fn main_loop(mut app: App) -> Result<glutin::WindowedContext<glutin::Possibl
                     .lock()
                     .unwrap()
                     .seek(time)
-                    .map_err(|error| MiscError(format!("Failed to seek: {error:?}").as_str()))?;
+                    .map_err(|error| MiscError(format!("Failed to seek: {error:?}")))?;
             }
             PlayerCmd::Mute => {
                 playerstate.mute = !playerstate.mute;
                 player
                     .lock()
                     .unwrap()
                     .mute(playerstate.mute)
-                    .map_err(|error| MiscError(format!("Failed to mute player: {error:?}").as_str()))?;
+                    .map_err(|error| MiscError(format!("Failed to mute player: {error:?}")))?;
             }
             _ => (),
         }

diff --git a/examples/player/context.rs b/examples/player/context.rs
@@ -2,6 +2,7 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
+use glutin::os::ContextTraitExt;
 use servo_media::player::context::*;
 
 pub struct PlayerContextGlutin {