From 00e89343fbb4c2580cb442095f3ff2907eb79b49 Mon Sep 17 00:00:00 2001 From: Harold Date: Tue, 3 Jul 2018 13:08:42 +0200 Subject: [PATCH] Formatting --- examples/play.rs | 3 ++- metadata/src/lib.rs | 21 ++++++++++++++------- playback/src/player.rs | 6 ++++-- protocol/files.rs | 2 +- 4 files changed, 21 insertions(+), 11 deletions(-) diff --git a/examples/play.rs b/examples/play.rs index ac261978..87f68825 100644 --- a/examples/play.rs +++ b/examples/play.rs @@ -33,7 +33,8 @@ fn main() { let backend = audio_backend::find(None).unwrap(); println!("Connecting .."); - let session = core.run(Session::connect(session_config, credentials, None, handle)) + let session = core + .run(Session::connect(session_config, credentials, None, handle)) .unwrap(); let (player, _) = Player::new(player_config, session.clone(), None, move || (backend)(None)); diff --git a/metadata/src/lib.rs b/metadata/src/lib.rs index a18a6940..a077f37c 100644 --- a/metadata/src/lib.rs +++ b/metadata/src/lib.rs @@ -110,13 +110,15 @@ impl Metadata for Track { fn parse(msg: &Self::Message, session: &Session) -> Self { let country = session.country(); - let artists = msg.get_artist() + let artists = msg + .get_artist() .iter() .filter(|artist| artist.has_gid()) .map(|artist| SpotifyId::from_raw(artist.get_gid()).unwrap()) .collect::>(); - let files = msg.get_file() + let files = msg + .get_file() .iter() .filter(|file| file.has_file_id()) .map(|file| { @@ -133,7 +135,8 @@ impl Metadata for Track { album: SpotifyId::from_raw(msg.get_album().get_gid()).unwrap(), artists: artists, files: files, - alternatives: msg.get_alternative() + alternatives: msg + .get_alternative() .iter() .map(|alt| SpotifyId::from_raw(alt.get_gid()).unwrap()) .collect(), @@ -150,20 +153,23 @@ impl Metadata for Album { } fn parse(msg: &Self::Message, _: &Session) -> Self { - let artists = msg.get_artist() + let artists = msg + .get_artist() .iter() .filter(|artist| artist.has_gid()) .map(|artist| SpotifyId::from_raw(artist.get_gid()).unwrap()) .collect::>(); - let tracks = msg.get_disc() + let tracks = msg + .get_disc() .iter() .flat_map(|disc| disc.get_track()) .filter(|track| track.has_gid()) .map(|track| SpotifyId::from_raw(track.get_gid()).unwrap()) .collect::>(); - let covers = msg.get_cover_group() + let covers = msg + .get_cover_group() .get_image() .iter() .filter(|image| image.has_file_id()) @@ -194,7 +200,8 @@ impl Metadata for Artist { fn parse(msg: &Self::Message, session: &Session) -> Self { let country = session.country(); - let top_tracks: Vec = match msg.get_top_track() + let top_tracks: Vec = match msg + .get_top_track() .iter() .find(|tt| !tt.has_country() || countrylist_contains(tt.get_country(), &country)) { diff --git a/playback/src/player.rs b/playback/src/player.rs index dd994235..ab1a8abe 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -557,7 +557,8 @@ impl PlayerInternal { } }; - let key = self.session + let key = self + .session .audio_key() .request(track.id, file_id) .wait() @@ -599,7 +600,8 @@ impl Drop for PlayerInternal { impl ::std::fmt::Debug for PlayerCommand { fn fmt(&self, f: &mut ::std::fmt::Formatter) -> ::std::fmt::Result { match *self { - PlayerCommand::Load(track, play, position, _) => f.debug_tuple("Load") + PlayerCommand::Load(track, play, position, _) => f + .debug_tuple("Load") .field(&track) .field(&play) .field(&position) diff --git a/protocol/files.rs b/protocol/files.rs index fe1c8fec..39b6b5ee 100644 --- a/protocol/files.rs +++ b/protocol/files.rs @@ -1,6 +1,6 @@ // Autogenerated by build.sh -pub const FILES : &'static [(&'static str, u32)] = &[ +pub const FILES: &'static [(&'static str, u32)] = &[ ("proto/authentication.proto", 2098196376), ("proto/keyexchange.proto", 451735664), ("proto/mercury.proto", 709993906),