Run everything through rustfmt once again

examples/src/bin/player.rs

@@ -61,7 +61,7 @@ fn main_loop(uri: &str) -> Result<(), Error> {
 
     let guard = error.as_ref().lock().unwrap();
 
-    guard.clone().map_err(|e|e.into())
+    guard.clone().map_err(|e| e.into())
 }
 
 #[allow(unused_variables)]
@@ -74,7 +74,8 @@ fn main() {
         std::process::exit(-1);
     };
 
-    #[cfg(not(feature = "gst-player"))] {
+    #[cfg(not(feature = "gst-player"))]
+    {
         eprintln!("Feature gst-player is required. Please rebuild with --features gst-player");
         std::process::exit(-1);
     }

gstreamer-audio/src/audio_channel_position.rs

@@ -34,11 +34,12 @@ impl AudioChannelPosition {
             return None;
         }
 
-        let positions_raw: [ffi::GstAudioChannelPosition; 64] =
+        let positions_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-            array_init::array_init_copy(|i| if i >= len as usize {
+            if i >= len as usize {
                 ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
             } else {
                 positions[i].to_glib()
+            }
         });
 
         unsafe {
@@ -100,12 +101,13 @@ impl AudioChannelPosition {
         }
 
         let len = positions.len();
-        let mut positions_raw: [ffi::GstAudioChannelPosition; 64] =
+        let mut positions_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(
-            array_init::array_init_copy(|i| if i >= len as usize {
+            |i| if i >= len as usize {
                 ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
             } else {
                 positions[i].to_glib()
-            });
+            },
+        );
 
         let valid: bool = unsafe {
             from_glib(ffi::gst_audio_channel_positions_to_valid_order(
@@ -143,11 +145,12 @@ impl AudioChannelPosition {
         }
 
         let len = positions.len();
-        let positions_raw: [ffi::GstAudioChannelPosition; 64] =
+        let positions_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-            array_init::array_init_copy(|i| if i >= len as usize {
+            if i >= len as usize {
                 ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
             } else {
                 positions[i].to_glib()
+            }
         });
 
         unsafe {
@@ -176,18 +179,20 @@ pub fn buffer_reorder_channels(
     let from_len = from.len();
     let to_len = to.len();
 
-    let from_raw: [ffi::GstAudioChannelPosition; 64] =
+    let from_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-        array_init::array_init_copy(|i| if i >= from_len as usize {
+        if i >= from_len as usize {
             ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
         } else {
             from[i].to_glib()
+        }
     });
 
-    let to_raw: [ffi::GstAudioChannelPosition; 64] =
+    let to_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-        array_init::array_init_copy(|i| if i >= to_len as usize {
+        if i >= to_len as usize {
             ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
         } else {
             to[i].to_glib()
+        }
     });
 
     let valid: bool = unsafe {
@@ -223,18 +228,20 @@ pub fn reorder_channels(
     let from_len = from.len();
     let to_len = to.len();
 
-    let from_raw: [ffi::GstAudioChannelPosition; 64] =
+    let from_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-        array_init::array_init_copy(|i| if i >= from_len as usize {
+        if i >= from_len as usize {
             ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
         } else {
             from[i].to_glib()
+        }
     });
 
-    let to_raw: [ffi::GstAudioChannelPosition; 64] =
+    let to_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-        array_init::array_init_copy(|i| if i >= to_len as usize {
+        if i >= to_len as usize {
             ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
         } else {
             to[i].to_glib()
+        }
     });
 
     let valid: bool = unsafe {
@@ -269,18 +276,20 @@ pub fn get_channel_reorder_map(
     let from_len = from.len();
     let to_len = to.len();
 
-    let from_raw: [ffi::GstAudioChannelPosition; 64] =
+    let from_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-        array_init::array_init_copy(|i| if i >= from_len as usize {
+        if i >= from_len as usize {
             ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
         } else {
             from[i].to_glib()
+        }
     });
 
-    let to_raw: [ffi::GstAudioChannelPosition; 64] =
+    let to_raw: [ffi::GstAudioChannelPosition; 64] = array_init::array_init_copy(|i| {
-        array_init::array_init_copy(|i| if i >= to_len as usize {
+        if i >= to_len as usize {
             ffi::GST_AUDIO_CHANNEL_POSITION_INVALID
         } else {
             to[i].to_glib()
+        }
     });
 
     let mut reorder_map_raw = [0i32, 64];

gstreamer/src/lib.rs

@@ -120,7 +120,7 @@ pub use device_provider::DeviceProviderExtManual;
 pub use parse_context::ParseContext;
 #[cfg(feature = "futures")]
 pub use bus::BusStream;
-pub use enums::{StateChangeSuccess, StateChangeError};
+pub use enums::{StateChangeError, StateChangeSuccess};
 pub use clock_time::ClockTime;
 pub use format::FormatValue;
 

gstreamer/src/object.rs

@@ -7,7 +7,7 @@
 // except according to those terms.
 
 use glib;
-use glib::{IsA, Cast};
+use glib::{Cast, IsA};
 use glib::translate::ToGlibPtr;
 use glib::signal::SignalHandlerId;
 use glib::object::ObjectExt;
@@ -29,11 +29,7 @@ impl<O: IsA<::Object> + IsA<glib::Object> + glib::value::SetValue> GstObjectExtM
         f: F,
     ) -> SignalHandlerId {
         self.connect("deep-notify", false, move |values| {
-            let obj: O = values[0]
+            let obj: O = values[0].get::<glib::Object>().unwrap().downcast().unwrap();
-                .get::<glib::Object>()
-                .unwrap()
-                .downcast()
-                .unwrap();
             let prop_obj: ::Object = values[1].get().unwrap();
 
             let prop_name = unsafe {

tutorials/src/bin/basic-tutorial-7.rs

@@ -65,7 +65,10 @@ fn main() {
     let queue_video_pad = video_queue.get_static_pad("sink").unwrap();
     tee_video_pad.link(&queue_video_pad).into_result().unwrap();
 
-    pipeline.set_state(gst::State::Playing).into_result().expect("Unable to set the pipeline to the Playing state.");
+    pipeline
+        .set_state(gst::State::Playing)
+        .into_result()
+        .expect("Unable to set the pipeline to the Playing state.");
     let bus = pipeline.get_bus().unwrap();
     while let Some(msg) = bus.timed_pop(gst::CLOCK_TIME_NONE) {
         use gst::MessageView;
@@ -84,5 +87,8 @@ fn main() {
         }
     }
 
-    pipeline.set_state(gst::State::Null).into_result().expect("Unable to set the pipeline to the Null state.");
+    pipeline
+        .set_state(gst::State::Null)
+        .into_result()
+        .expect("Unable to set the pipeline to the Null state.");
 }