From 6f28b0486fd3110c504e3b39d3a452b6f54e6dce Mon Sep 17 00:00:00 2001 From: Konstantin Seiler Date: Tue, 10 Mar 2020 23:26:01 +1100 Subject: [PATCH 01/26] Emit blocking sink events --- playback/src/player.rs | 70 +++++++++++++++++++++++++++++-------- src/main.rs | 16 ++++++++- src/player_event_handler.rs | 16 +++++++++ 3 files changed, 87 insertions(+), 15 deletions(-) diff --git a/playback/src/player.rs b/playback/src/player.rs index ef7484c7..4b207790 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -33,6 +33,15 @@ pub struct Player { play_request_id_generator: SeqGenerator, } +#[derive(PartialEq, Debug, Clone, Copy)] +pub enum SinkStatus { + Running, + Closed, + TemporarilyClosed, +} + +pub type SinkEventCallback = Box; + struct PlayerInternal { session: Session, config: PlayerConfig, @@ -41,7 +50,8 @@ struct PlayerInternal { state: PlayerState, preload: PlayerPreload, sink: Box, - sink_running: bool, + sink_status: SinkStatus, + sink_event_callback: Option, audio_filter: Option>, event_senders: Vec>, } @@ -61,6 +71,7 @@ enum PlayerCommand { Stop, Seek(u32), AddEventSender(futures::sync::mpsc::UnboundedSender), + SetSinkEventCallback(Option), EmitVolumeSetEvent(u16), } @@ -212,7 +223,8 @@ impl Player { state: PlayerState::Stopped, preload: PlayerPreload::None, sink: sink_builder(), - sink_running: false, + sink_status: SinkStatus::Closed, + sink_event_callback: None, audio_filter: audio_filter, event_senders: [event_sender].to_vec(), }; @@ -288,6 +300,10 @@ impl Player { Box::new(result) } + pub fn set_sink_event_callback(&self, callback: Option) { + self.command(PlayerCommand::SetSinkEventCallback(callback)); + } + pub fn emit_volume_set_event(&self, volume: u16) { self.command(PlayerCommand::EmitVolumeSetEvent(volume)); } @@ -862,20 +878,41 @@ impl PlayerInternal { } fn ensure_sink_running(&mut self) { - if !self.sink_running { + if self.sink_status != SinkStatus::Running { trace!("== Starting sink =="); + if let Some(callback) = &mut self.sink_event_callback { + callback(SinkStatus::Running); + } match self.sink.start() { - Ok(()) => self.sink_running = true, + Ok(()) => self.sink_status = SinkStatus::Running, Err(err) => error!("Could not start audio: {}", err), } } } - fn ensure_sink_stopped(&mut self) { - if self.sink_running { - trace!("== Stopping sink =="); - self.sink.stop().unwrap(); - self.sink_running = false; + fn ensure_sink_stopped(&mut self, temporarily: bool) { + match self.sink_status { + SinkStatus::Running => { + trace!("== Stopping sink =="); + self.sink.stop().unwrap(); + self.sink_status = if temporarily { + SinkStatus::TemporarilyClosed + } else { + SinkStatus::Closed + }; + if let Some(callback) = &mut self.sink_event_callback { + callback(self.sink_status); + } + } + SinkStatus::TemporarilyClosed => { + if !temporarily { + self.sink_status = SinkStatus::Closed; + if let Some(callback) = &mut self.sink_event_callback { + callback(SinkStatus::Closed); + } + } + } + SinkStatus::Closed => (), } } @@ -901,7 +938,7 @@ impl PlayerInternal { play_request_id, .. } => { - self.ensure_sink_stopped(); + self.ensure_sink_stopped(false); self.send_event(PlayerEvent::Stopped { track_id, play_request_id, @@ -948,7 +985,7 @@ impl PlayerInternal { { self.state.playing_to_paused(); - self.ensure_sink_stopped(); + self.ensure_sink_stopped(false); let position_ms = Self::position_pcm_to_ms(stream_position_pcm); self.send_event(PlayerEvent::Paused { track_id, @@ -977,7 +1014,7 @@ impl PlayerInternal { if let Err(err) = self.sink.write(&packet.data()) { error!("Could not write audio: {}", err); - self.ensure_sink_stopped(); + self.ensure_sink_stopped(false); } } } @@ -1035,7 +1072,7 @@ impl PlayerInternal { suggested_to_preload_next_track: false, }; } else { - self.ensure_sink_stopped(); + self.ensure_sink_stopped(false); self.state = PlayerState::Paused { track_id: track_id, @@ -1227,7 +1264,7 @@ impl PlayerInternal { // We need to load the track - either from scratch or by completing a preload. // In any case we go into a Loading state to load the track. - self.ensure_sink_stopped(); + self.ensure_sink_stopped(play); self.send_event(PlayerEvent::Loading { track_id, @@ -1409,6 +1446,8 @@ impl PlayerInternal { PlayerCommand::AddEventSender(sender) => self.event_senders.push(sender), + PlayerCommand::SetSinkEventCallback(callback) => self.sink_event_callback = callback, + PlayerCommand::EmitVolumeSetEvent(volume) => { self.send_event(PlayerEvent::VolumeSet { volume }) } @@ -1513,6 +1552,9 @@ impl ::std::fmt::Debug for PlayerCommand { PlayerCommand::Stop => f.debug_tuple("Stop").finish(), PlayerCommand::Seek(position) => f.debug_tuple("Seek").field(&position).finish(), PlayerCommand::AddEventSender(_) => f.debug_tuple("AddEventSender").finish(), + PlayerCommand::SetSinkEventCallback(_) => { + f.debug_tuple("SetSinkEventCallback").finish() + } PlayerCommand::EmitVolumeSetEvent(volume) => { f.debug_tuple("VolumeSet").field(&volume).finish() } diff --git a/src/main.rs b/src/main.rs index f749a525..a6afb46a 100644 --- a/src/main.rs +++ b/src/main.rs @@ -27,7 +27,7 @@ use librespot::playback::mixer::{self, Mixer, MixerConfig}; use librespot::playback::player::{Player, PlayerEvent}; mod player_event_handler; -use crate::player_event_handler::run_program_on_events; +use crate::player_event_handler::{emit_sink_event, run_program_on_events}; fn device_id(name: &str) -> String { hex::encode(Sha1::digest(name.as_bytes())) @@ -87,6 +87,7 @@ struct Setup { enable_discovery: bool, zeroconf_port: u16, player_event_program: Option, + emit_sink_events: bool, } fn setup(args: &[String]) -> Setup { @@ -111,6 +112,7 @@ fn setup(args: &[String]) -> Setup { "Run PROGRAM when playback is about to begin.", "PROGRAM", ) + .optflag("", "emit-sink-events", "Run program set by --onevent before sink is opened and after it is closed.") .optflag("v", "verbose", "Enable verbose output") .optopt("u", "username", "Username to sign in with", "USERNAME") .optopt("p", "password", "Password", "PASSWORD") @@ -354,6 +356,7 @@ fn setup(args: &[String]) -> Setup { mixer: mixer, mixer_config: mixer_config, player_event_program: matches.opt_str("onevent"), + emit_sink_events: matches.opt_present("emit-sink-events"), } } @@ -381,6 +384,7 @@ struct Main { player_event_channel: Option>, player_event_program: Option, + emit_sink_events: bool, } impl Main { @@ -407,6 +411,7 @@ impl Main { player_event_channel: None, player_event_program: setup.player_event_program, + emit_sink_events: setup.emit_sink_events, }; if setup.enable_discovery { @@ -476,6 +481,15 @@ impl Future for Main { (backend)(device) }); + if self.emit_sink_events { + if let Some(player_event_program) = &self.player_event_program { + let player_event_program = player_event_program.clone(); + player.set_sink_event_callback(Some(Box::new(move |sink_status| { + emit_sink_event(sink_status, &player_event_program) + }))); + } + } + let (spirc, spirc_task) = Spirc::new(connect_config, session, player, mixer); self.spirc = Some(spirc); self.spirc_task = Some(spirc_task); diff --git a/src/player_event_handler.rs b/src/player_event_handler.rs index 2fa34d2b..f9dc2007 100644 --- a/src/player_event_handler.rs +++ b/src/player_event_handler.rs @@ -5,6 +5,9 @@ use std::io; use std::process::Command; use tokio_process::{Child, CommandExt}; +use futures::Future; +use librespot::playback::player::SinkStatus; + fn run_program(program: &str, env_vars: HashMap<&str, String>) -> io::Result { let mut v: Vec<&str> = program.split_whitespace().collect(); info!("Running {:?} with environment variables {:?}", v, env_vars); @@ -37,3 +40,16 @@ pub fn run_program_on_events(event: PlayerEvent, onevent: &str) -> Option "running", + SinkStatus::TemporarilyClosed => "temporarily_closed", + SinkStatus::Closed => "closed", + }; + env_vars.insert("SINK_STATUS", sink_status.to_string()); + + let _ = run_program(onevent, env_vars).and_then(|child| child.wait()); +} From d4d55254b035db3a9374835fbe420d5a2340a2e6 Mon Sep 17 00:00:00 2001 From: Konstantin Seiler Date: Tue, 10 Mar 2020 23:53:58 +1100 Subject: [PATCH 02/26] address merge conflict --- playback/src/player.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/playback/src/player.rs b/playback/src/player.rs index 30faadc6..f685fd71 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -1103,7 +1103,7 @@ impl PlayerInternal { position_ms: u32, ) { if !self.config.gapless { - self.ensure_sink_stopped(); + self.ensure_sink_stopped(play); } // emit the correct player event match self.state { From b63199743aef01868a67be451e6d46a288264235 Mon Sep 17 00:00:00 2001 From: ashthespy Date: Sat, 9 May 2020 13:59:28 +0200 Subject: [PATCH 03/26] Skip unplayable tracks instead of stopping --- playback/src/player.rs | 65 ++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 63 insertions(+), 2 deletions(-) diff --git a/playback/src/player.rs b/playback/src/player.rs index a26d3583..0a6fd41f 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -378,6 +378,7 @@ impl PlayerState { } } + #[allow(dead_code)] fn is_stopped(&self) -> bool { use self::PlayerState::*; match *self { @@ -386,6 +387,14 @@ impl PlayerState { } } + fn is_loading(&self) -> bool { + use self::PlayerState::*; + match *self { + Loading { .. } => true, + _ => false, + } + } + fn decoder(&mut self) -> Option<&mut Decoder> { use self::PlayerState::*; match *self { @@ -728,8 +737,14 @@ impl Future for PlayerInternal { } Ok(Async::NotReady) => (), Err(_) => { - self.handle_player_stop(); - assert!(self.state.is_stopped()); + warn!("Unable to load <{:?}>", track_id); + warn!("Skipping to next track"); + trace!("State: {:?}", self.state); + assert!(self.state.is_loading()); + self.send_event(PlayerEvent::EndOfTrack { + track_id, + play_request_id, + }) } } } @@ -749,6 +764,7 @@ impl Future for PlayerInternal { } Ok(Async::NotReady) => (), Err(_) => { + warn!("Unable to preload {:?}", track_id); self.preload = PlayerPreload::None; } } @@ -1523,6 +1539,51 @@ impl ::std::fmt::Debug for PlayerCommand { } } +impl ::std::fmt::Debug for PlayerState { + fn fmt(&self, f: &mut ::std::fmt::Formatter<'_>) -> ::std::fmt::Result { + use PlayerState::*; + match *self { + Stopped => f.debug_struct("Stopped").finish(), + Loading { + track_id, + play_request_id, + .. + } => f + .debug_struct("Loading") + .field("track_id", &track_id) + .field("play_request_id", &play_request_id) + .finish(), + Paused { + track_id, + play_request_id, + .. + } => f + .debug_struct("Paused") + .field("track_id", &track_id) + .field("play_request_id", &play_request_id) + .finish(), + Playing { + track_id, + play_request_id, + .. + } => f + .debug_struct("Playing") + .field("track_id", &track_id) + .field("play_request_id", &play_request_id) + .finish(), + EndOfTrack { + track_id, + play_request_id, + .. + } => f + .debug_struct("EndOfTrack") + .field("track_id", &track_id) + .field("play_request_id", &play_request_id) + .finish(), + Invalid => f.debug_struct("Invalid").finish(), + } + } +} struct Subfile { stream: T, offset: u64, From 902440925d2c4b334d7b72fe64b198ef377692f8 Mon Sep 17 00:00:00 2001 From: ashthespy Date: Sun, 10 May 2020 14:31:43 +0200 Subject: [PATCH 04/26] Handle unplayable tracks during prefetch --- connect/src/spirc.rs | 46 ++++++++++++++++++++++++------------------ playback/src/player.rs | 42 ++++++++++++++++++++++++++++++++++---- 2 files changed, 64 insertions(+), 24 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 453327c5..06bf37fc 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -621,24 +621,26 @@ impl SpircTask { self.play_status = SpircPlayStatus::Stopped; } }, - PlayerEvent::TimeToPreloadNextTrack { .. } => match self.play_status { - SpircPlayStatus::Paused { - ref mut preloading_of_next_track_triggered, - .. - } - | SpircPlayStatus::Playing { - ref mut preloading_of_next_track_triggered, - .. - } => { - *preloading_of_next_track_triggered = true; - if let Some(track_id) = self.preview_next_track() { - self.player.preload(track_id); + PlayerEvent::TimeToPreloadNextTrack { preload_index, .. } => { + match self.play_status { + SpircPlayStatus::Paused { + ref mut preloading_of_next_track_triggered, + .. } + | SpircPlayStatus::Playing { + ref mut preloading_of_next_track_triggered, + .. + } => { + *preloading_of_next_track_triggered = true; + if let Some(track_id) = self.preview_next_track(preload_index) { + self.player.preload(track_id); + } + } + SpircPlayStatus::LoadingPause { .. } + | SpircPlayStatus::LoadingPlay { .. } + | SpircPlayStatus::Stopped => (), } - SpircPlayStatus::LoadingPause { .. } - | SpircPlayStatus::LoadingPlay { .. } - | SpircPlayStatus::Stopped => (), - }, + } _ => (), } } @@ -777,7 +779,8 @@ impl SpircTask { } = self.play_status { if preloading_of_next_track_triggered { - if let Some(track_id) = self.preview_next_track() { + // Get the next track_id in the playlist + if let Some(track_id) = self.preview_next_track(1) { self.player.preload(track_id); } } @@ -899,9 +902,12 @@ impl SpircTask { } } - fn preview_next_track(&mut self) -> Option { - self.get_track_id_to_play_from_playlist(self.state.get_playing_track_index() + 1) - .and_then(|(track_id, _)| Some(track_id)) + fn preview_next_track(&mut self, preview_index: u32) -> Option { + trace!("Previewing {:}", preview_index); + self.get_track_id_to_play_from_playlist( + self.state.get_playing_track_index() + preview_index, + ) + .and_then(|(track_id, _)| Some(track_id)) } fn handle_next(&mut self) { diff --git a/playback/src/player.rs b/playback/src/player.rs index 0a6fd41f..4ea50419 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -99,6 +99,7 @@ pub enum PlayerEvent { TimeToPreloadNextTrack { play_request_id: u64, track_id: SpotifyId, + preload_index: u32, }, EndOfTrack { play_request_id: u64, @@ -320,6 +321,10 @@ enum PlayerPreload { Loading { track_id: SpotifyId, loader: Box>, + preload_index: u32, + }, + Missing { + preload_index: u32, }, Ready { track_id: SpotifyId, @@ -753,6 +758,7 @@ impl Future for PlayerInternal { if let PlayerPreload::Loading { ref mut loader, track_id, + preload_index, } = self.preload { match loader.poll() { @@ -764,8 +770,26 @@ impl Future for PlayerInternal { } Ok(Async::NotReady) => (), Err(_) => { - warn!("Unable to preload {:?}", track_id); - self.preload = PlayerPreload::None; + warn!("Unable to preload {:?}[{}]", track_id, preload_index,); + // Preemptively fetch next track? + self.preload = PlayerPreload::Missing { preload_index }; + if let PlayerState::Playing { + play_request_id, .. + } + | PlayerState::Paused { + play_request_id, .. + } = self.state + { + debug!( + "Requesting track_id for preload_index: {}", + preload_index + 1 + ); + self.send_event(PlayerEvent::TimeToPreloadNextTrack { + track_id, + play_request_id, + preload_index: preload_index + 1, + }); + } } } } @@ -853,6 +877,7 @@ impl Future for PlayerInternal { self.send_event(PlayerEvent::TimeToPreloadNextTrack { track_id, play_request_id, + preload_index: 1, }); } } @@ -1294,7 +1319,12 @@ impl PlayerInternal { fn handle_command_preload(&mut self, track_id: SpotifyId) { debug!("Preloading track"); let mut preload_track = true; - + let preload_index = match self.preload { + PlayerPreload::Loading { preload_index, .. } => preload_index, + // The last preload was missing, so increment it + PlayerPreload::Missing { preload_index, .. } => preload_index + 1, + _ => 1, + }; // check whether the track is already loaded somewhere or being loaded. if let PlayerPreload::Loading { track_id: currently_loading, @@ -1336,7 +1366,11 @@ impl PlayerInternal { // schedule the preload if the current track if desired. if preload_track { let loader = self.load_track(track_id, 0); - self.preload = PlayerPreload::Loading { track_id, loader } + self.preload = PlayerPreload::Loading { + track_id, + loader, + preload_index, + } } } From 6f084d7ea52b1bad15d72cd97d0a21d32b943b8f Mon Sep 17 00:00:00 2001 From: PlusMinus0 Date: Sun, 10 May 2020 22:19:40 +0200 Subject: [PATCH 05/26] Fix utf username. --- connect/src/spirc.rs | 7 +++++-- core/src/mercury/mod.rs | 3 ++- core/src/util/mod.rs | 15 +++++++++++++++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 77785e3c..cb196ec3 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -14,10 +14,12 @@ use crate::playback::mixer::Mixer; use crate::playback::player::{Player, PlayerEvent, PlayerEventChannel}; use crate::protocol; use crate::protocol::spirc::{DeviceState, Frame, MessageType, PlayStatus, State, TrackRef}; + use librespot_core::config::ConnectConfig; use librespot_core::mercury::MercuryError; use librespot_core::session::Session; use librespot_core::spotify_id::{SpotifyAudioType, SpotifyId, SpotifyIdError}; +use librespot_core::util::url_encode; use librespot_core::util::SeqGenerator; use librespot_core::version; use librespot_core::volume::Volume; @@ -249,7 +251,8 @@ impl Spirc { let ident = session.device_id().to_owned(); // Uri updated in response to issue #288 - let uri = format!("hm://remote/user/{}/", session.username()); + debug!("canonical_username: {}", url_encode(&session.username())); + let uri = format!("hm://remote/user/{}/", url_encode(&session.username())); let subscription = session.mercury().subscribe(&uri as &str); let subscription = subscription @@ -919,7 +922,7 @@ impl SpircTask { if (context_uri.starts_with("spotify:station:") || context_uri.starts_with("spotify:dailymix:") // spotify:user:xxx:collection - || context_uri.starts_with(&format!("spotify:user:{}:collection",self.session.username()))) + || context_uri.starts_with(&format!("spotify:user:{}:collection",url_encode(&self.session.username())))) && ((self.state.get_track().len() as u32) - new_index) < CONTEXT_FETCH_THRESHOLD { self.context_fut = self.resolve_station(&context_uri); diff --git a/core/src/mercury/mod.rs b/core/src/mercury/mod.rs index e167f9c9..20e3f0db 100644 --- a/core/src/mercury/mod.rs +++ b/core/src/mercury/mod.rs @@ -1,4 +1,5 @@ use crate::protocol; +use crate::util::url_encode; use byteorder::{BigEndian, ByteOrder}; use bytes::Bytes; use futures::sync::{mpsc, oneshot}; @@ -192,7 +193,7 @@ impl MercuryManager { let header: protocol::mercury::Header = protobuf::parse_from_bytes(&header_data).unwrap(); let response = MercuryResponse { - uri: header.get_uri().to_owned(), + uri: url_encode(header.get_uri()).to_owned(), status_code: header.get_status_code(), payload: pending.parts, }; diff --git a/core/src/util/mod.rs b/core/src/util/mod.rs index 800e04e1..c55d9601 100644 --- a/core/src/util/mod.rs +++ b/core/src/util/mod.rs @@ -12,6 +12,21 @@ pub fn rand_vec(rng: &mut G, size: usize) -> Vec { .collect() } +pub fn url_encode(inp: &str) -> String { + let mut encoded = String::new(); + + for c in inp.as_bytes().iter() { + match *c as char { + 'A'..='Z' | 'a'..='z' | '0'..='9' | '-' | '_' | '.' | '~' | ':' | '/' => { + encoded.push(*c as char) + } + c => encoded.push_str(format!("%{:02X}", c as u32).as_str()), + }; + } + + encoded +} + pub fn powm(base: &BigUint, exp: &BigUint, modulus: &BigUint) -> BigUint { let mut base = base.clone(); let mut exp = exp.clone(); From 14709b9f8deeba75f7de808dc3421f962a1a49c9 Mon Sep 17 00:00:00 2001 From: ashthespy Date: Wed, 13 May 2020 11:49:26 +0200 Subject: [PATCH 06/26] Let spirc handle unavailable tracks --- connect/src/spirc.rs | 80 ++++++++++++++++++++++++++++-------------- playback/src/player.rs | 43 +++++++---------------- 2 files changed, 66 insertions(+), 57 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index 06bf37fc..76ce456e 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -621,26 +621,8 @@ impl SpircTask { self.play_status = SpircPlayStatus::Stopped; } }, - PlayerEvent::TimeToPreloadNextTrack { preload_index, .. } => { - match self.play_status { - SpircPlayStatus::Paused { - ref mut preloading_of_next_track_triggered, - .. - } - | SpircPlayStatus::Playing { - ref mut preloading_of_next_track_triggered, - .. - } => { - *preloading_of_next_track_triggered = true; - if let Some(track_id) = self.preview_next_track(preload_index) { - self.player.preload(track_id); - } - } - SpircPlayStatus::LoadingPause { .. } - | SpircPlayStatus::LoadingPlay { .. } - | SpircPlayStatus::Stopped => (), - } - } + PlayerEvent::TimeToPreloadNextTrack { .. } => self.handle_preload_next_track(), + PlayerEvent::Unavailable { track_id, .. } => self.handle_unavalable(track_id), _ => (), } } @@ -780,7 +762,7 @@ impl SpircTask { { if preloading_of_next_track_triggered { // Get the next track_id in the playlist - if let Some(track_id) = self.preview_next_track(1) { + if let Some(track_id) = self.preview_next_track() { self.player.preload(track_id); } } @@ -902,12 +884,44 @@ impl SpircTask { } } - fn preview_next_track(&mut self, preview_index: u32) -> Option { - trace!("Previewing {:}", preview_index); - self.get_track_id_to_play_from_playlist( - self.state.get_playing_track_index() + preview_index, - ) - .and_then(|(track_id, _)| Some(track_id)) + fn preview_next_track(&mut self) -> Option { + self.get_track_id_to_play_from_playlist(self.state.get_playing_track_index() + 1) + .and_then(|(track_id, _)| Some(track_id)) + } + + fn handle_preload_next_track(&mut self) { + // Requests the player thread to preload the next track + match self.play_status { + SpircPlayStatus::Paused { + ref mut preloading_of_next_track_triggered, + .. + } + | SpircPlayStatus::Playing { + ref mut preloading_of_next_track_triggered, + .. + } => { + *preloading_of_next_track_triggered = true; + if let Some(track_id) = self.preview_next_track() { + self.player.preload(track_id); + } + } + SpircPlayStatus::LoadingPause { .. } + | SpircPlayStatus::LoadingPlay { .. } + | SpircPlayStatus::Stopped => (), + } + } + + fn handle_unavalable(&mut self, track_id: SpotifyId) { + let unavalable_index = self.get_track_index_for_spotify_id( + &track_id, + self.state.get_playing_track_index() as usize, + ); + if let Some(index) = unavalable_index { + // TODO: Or mark it as NonPlayable? + debug!("Removing unavailable track_ref at {:?}", index); + self.state.mut_track().remove(index); + } + self.handle_preload_next_track(); } fn handle_next(&mut self) { @@ -1141,6 +1155,18 @@ impl SpircTask { }) } + fn get_track_index_for_spotify_id( + &self, + track_id: &SpotifyId, + start_index: usize, + ) -> Option { + let index = self.state.get_track()[start_index..] + .iter() + .position(|track_ref| self.get_spotify_id_for_track(track_ref) == Ok(*track_id)); + + index + } + fn get_track_id_to_play_from_playlist(&self, index: u32) -> Option<(SpotifyId, u32)> { let tracks_len = self.state.get_track().len() as u32; diff --git a/playback/src/player.rs b/playback/src/player.rs index 4ea50419..ef576073 100644 --- a/playback/src/player.rs +++ b/playback/src/player.rs @@ -99,7 +99,10 @@ pub enum PlayerEvent { TimeToPreloadNextTrack { play_request_id: u64, track_id: SpotifyId, - preload_index: u32, + }, + Unavailable { + play_request_id: u64, + track_id: SpotifyId, }, EndOfTrack { play_request_id: u64, @@ -117,6 +120,9 @@ impl PlayerEvent { Loading { play_request_id, .. } + | Unavailable { + play_request_id, .. + } | Started { play_request_id, .. } @@ -321,10 +327,6 @@ enum PlayerPreload { Loading { track_id: SpotifyId, loader: Box>, - preload_index: u32, - }, - Missing { - preload_index: u32, }, Ready { track_id: SpotifyId, @@ -742,9 +744,7 @@ impl Future for PlayerInternal { } Ok(Async::NotReady) => (), Err(_) => { - warn!("Unable to load <{:?}>", track_id); - warn!("Skipping to next track"); - trace!("State: {:?}", self.state); + warn!("Unable to load <{:?}>\nSkipping to next track", track_id); assert!(self.state.is_loading()); self.send_event(PlayerEvent::EndOfTrack { track_id, @@ -758,7 +758,6 @@ impl Future for PlayerInternal { if let PlayerPreload::Loading { ref mut loader, track_id, - preload_index, } = self.preload { match loader.poll() { @@ -770,9 +769,9 @@ impl Future for PlayerInternal { } Ok(Async::NotReady) => (), Err(_) => { - warn!("Unable to preload {:?}[{}]", track_id, preload_index,); - // Preemptively fetch next track? - self.preload = PlayerPreload::Missing { preload_index }; + debug!("Unable to preload {:?}", track_id); + self.preload = PlayerPreload::None; + // Let Spirc know that the track was unavailable. if let PlayerState::Playing { play_request_id, .. } @@ -780,14 +779,9 @@ impl Future for PlayerInternal { play_request_id, .. } = self.state { - debug!( - "Requesting track_id for preload_index: {}", - preload_index + 1 - ); - self.send_event(PlayerEvent::TimeToPreloadNextTrack { + self.send_event(PlayerEvent::Unavailable { track_id, play_request_id, - preload_index: preload_index + 1, }); } } @@ -877,7 +871,6 @@ impl Future for PlayerInternal { self.send_event(PlayerEvent::TimeToPreloadNextTrack { track_id, play_request_id, - preload_index: 1, }); } } @@ -1319,12 +1312,6 @@ impl PlayerInternal { fn handle_command_preload(&mut self, track_id: SpotifyId) { debug!("Preloading track"); let mut preload_track = true; - let preload_index = match self.preload { - PlayerPreload::Loading { preload_index, .. } => preload_index, - // The last preload was missing, so increment it - PlayerPreload::Missing { preload_index, .. } => preload_index + 1, - _ => 1, - }; // check whether the track is already loaded somewhere or being loaded. if let PlayerPreload::Loading { track_id: currently_loading, @@ -1366,11 +1353,7 @@ impl PlayerInternal { // schedule the preload if the current track if desired. if preload_track { let loader = self.load_track(track_id, 0); - self.preload = PlayerPreload::Loading { - track_id, - loader, - preload_index, - } + self.preload = PlayerPreload::Loading { track_id, loader } } } From 9cacc2d09fd08bb132a250df51d1f77f9315f15f Mon Sep 17 00:00:00 2001 From: ashthespy Date: Wed, 13 May 2020 13:24:30 +0200 Subject: [PATCH 07/26] Fix regression in track cycling --- connect/src/spirc.rs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index aa7aae6d..ececdbae 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -1170,9 +1170,9 @@ impl SpircTask { } fn get_track_id_to_play_from_playlist(&self, index: u32) -> Option<(SpotifyId, u32)> { - let tracks_len = self.state.get_track().len() as u32; + let tracks_len = self.state.get_track().len(); - let mut new_playlist_index = index; + let mut new_playlist_index = index as usize; if new_playlist_index >= tracks_len { new_playlist_index = 0; @@ -1184,7 +1184,7 @@ impl SpircTask { // tracks in each frame either have a gid or uri (that may or may not be a valid track) // E.g - context based frames sometimes contain tracks with - let mut track_ref = self.state.get_track()[new_playlist_index as usize].clone(); + let mut track_ref = self.state.get_track()[new_playlist_index].clone(); let mut track_id = self.get_spotify_id_for_track(&track_ref); while track_id.is_err() || track_id.unwrap().audio_type == SpotifyAudioType::NonPlayable { warn!( @@ -1203,12 +1203,12 @@ impl SpircTask { warn!("No playable track found in state: {:?}", self.state); return None; } - track_ref = self.state.get_track()[index as usize].clone(); + track_ref = self.state.get_track()[new_playlist_index].clone(); track_id = self.get_spotify_id_for_track(&track_ref); } match track_id { - Ok(track_id) => Some((track_id, new_playlist_index)), + Ok(track_id) => Some((track_id, new_playlist_index as u32)), Err(_) => None, } } From 01813cf7c95c8e75b5fce39f6d99d22ca2f8fef2 Mon Sep 17 00:00:00 2001 From: ashthespy Date: Wed, 13 May 2020 13:30:30 +0200 Subject: [PATCH 08/26] Tweak unavailable track handling Flag them as `NonPlayable` instead of removing them from the queue --- connect/src/spirc.rs | 55 ++++++++++++++++++++++++++++++++------------ 1 file changed, 40 insertions(+), 15 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index ececdbae..b6de59f2 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -454,8 +454,8 @@ impl SpircTask { Ok(dur) => dur, Err(err) => err.duration(), }; - ((dur.as_secs() as i64 + self.session.time_delta()) * 1000 - + (dur.subsec_nanos() / 1000_000) as i64) + (dur.as_secs() as i64 + self.session.time_delta()) * 1000 + + (dur.subsec_nanos() / 1000_000) as i64 } fn ensure_mixer_started(&mut self) { @@ -622,7 +622,7 @@ impl SpircTask { } }, PlayerEvent::TimeToPreloadNextTrack { .. } => self.handle_preload_next_track(), - PlayerEvent::Unavailable { track_id, .. } => self.handle_unavalable(track_id), + PlayerEvent::Unavailable { track_id, .. } => self.handle_unavailable(track_id), _ => (), } } @@ -910,16 +910,28 @@ impl SpircTask { | SpircPlayStatus::Stopped => (), } } - - fn handle_unavalable(&mut self, track_id: SpotifyId) { - let unavalable_index = self.get_track_index_for_spotify_id( + // Mark unavailable tracks so we can skip them later + fn handle_unavailable(&mut self, track_id: SpotifyId) { + let unavailables = self.get_track_index_for_spotify_id( &track_id, self.state.get_playing_track_index() as usize, ); - if let Some(index) = unavalable_index { - // TODO: Or mark it as NonPlayable? - debug!("Removing unavailable track_ref at {:?}", index); - self.state.mut_track().remove(index); + + for &index in unavailables.iter() { + debug_assert_eq!(self.state.get_track()[index].get_gid(), track_id.to_raw()); + let mut unplayable_track_ref = TrackRef::new(); + unplayable_track_ref.set_gid(self.state.get_track()[index].get_gid().to_vec()); + // Misuse context field to flag the track + unplayable_track_ref.set_context(String::from("NonPlayable")); + std::mem::swap( + &mut self.state.mut_track()[index], + &mut unplayable_track_ref, + ); + debug!( + "Marked <{:?}> at {:?} as NonPlayable", + self.state.get_track()[index], + index, + ); } self.handle_preload_next_track(); } @@ -1157,18 +1169,28 @@ impl SpircTask { }) } + // Helper to find corresponding index(s) for track_id fn get_track_index_for_spotify_id( &self, track_id: &SpotifyId, start_index: usize, - ) -> Option { - let index = self.state.get_track()[start_index..] + ) -> Vec { + let index: Vec = self.state.get_track()[start_index..] .iter() - .position(|track_ref| self.get_spotify_id_for_track(track_ref) == Ok(*track_id)); - + .enumerate() + .filter(|&(_, track_ref)| track_ref.get_gid() == track_id.to_raw()) + .map(|(idx, _)| start_index + idx) + .collect(); + // Sanity check + debug_assert!(!index.is_empty()); index } + // Broken out here so we can refactor this later when we move to SpotifyObjectID or similar + fn track_ref_is_unavailable(&self, track_ref: &TrackRef) -> bool { + track_ref.get_context() == "NonPlayable" + } + fn get_track_id_to_play_from_playlist(&self, index: u32) -> Option<(SpotifyId, u32)> { let tracks_len = self.state.get_track().len(); @@ -1186,7 +1208,10 @@ impl SpircTask { let mut track_ref = self.state.get_track()[new_playlist_index].clone(); let mut track_id = self.get_spotify_id_for_track(&track_ref); - while track_id.is_err() || track_id.unwrap().audio_type == SpotifyAudioType::NonPlayable { + while self.track_ref_is_unavailable(&track_ref) + || track_id.is_err() + || track_id.unwrap().audio_type == SpotifyAudioType::NonPlayable + { warn!( "Skipping track <{:?}> at position [{}] of {}", track_ref.get_uri(), From 1da80ce480a4e398c2e0c6bd896da6f1da38835e Mon Sep 17 00:00:00 2001 From: ashthespy Date: Wed, 27 May 2020 16:24:21 +0200 Subject: [PATCH 09/26] Handle unplayable track at start of playlist --- connect/src/spirc.rs | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index b6de59f2..c0bcfcfa 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -910,13 +910,17 @@ impl SpircTask { | SpircPlayStatus::Stopped => (), } } + // Mark unavailable tracks so we can skip them later fn handle_unavailable(&mut self, track_id: SpotifyId) { - let unavailables = self.get_track_index_for_spotify_id( - &track_id, - self.state.get_playing_track_index() as usize, - ); - + let playing_index = self.state.get_playing_track_index() as usize; + let search_from = if playing_index == self.state.get_track().len() - 1 { + trace!("Cycling back to 0 instead of {:?}", playing_index); + 0 + } else { + playing_index + }; + let unavailables = self.get_track_index_for_spotify_id(&track_id, search_from); for &index in unavailables.iter() { debug_assert_eq!(self.state.get_track()[index].get_gid(), track_id.to_raw()); let mut unplayable_track_ref = TrackRef::new(); From a28199f07341f3437cb8d6959c6c3f79f11b4a51 Mon Sep 17 00:00:00 2001 From: ashthespy Date: Wed, 27 May 2020 18:14:31 +0200 Subject: [PATCH 10/26] Tweak handling unavailables at start of playlists --- connect/src/spirc.rs | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index c0bcfcfa..c6feb728 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -914,13 +914,19 @@ impl SpircTask { // Mark unavailable tracks so we can skip them later fn handle_unavailable(&mut self, track_id: SpotifyId) { let playing_index = self.state.get_playing_track_index() as usize; - let search_from = if playing_index == self.state.get_track().len() - 1 { - trace!("Cycling back to 0 instead of {:?}", playing_index); - 0 - } else { - playing_index - }; - let unavailables = self.get_track_index_for_spotify_id(&track_id, search_from); + let mut unavailables = self.get_track_index_for_spotify_id(&track_id, playing_index); + if unavailables.is_empty() { + trace!( + "Couldn't find unavailables searching from {:?} -- {:?}, cycling through entire playlist", + playing_index, + self.state.get_track().len() + ); + // We could just do this everytime, but for most cases it's needless overhead. + // we are still repeating the serach for (playing_index..) in this case + unavailables = self.get_track_index_for_spotify_id(&track_id, 0); + } + // Sanity check + debug_assert!(!unavailables.is_empty()); for &index in unavailables.iter() { debug_assert_eq!(self.state.get_track()[index].get_gid(), track_id.to_raw()); let mut unplayable_track_ref = TrackRef::new(); @@ -1185,8 +1191,6 @@ impl SpircTask { .filter(|&(_, track_ref)| track_ref.get_gid() == track_id.to_raw()) .map(|(idx, _)| start_index + idx) .collect(); - // Sanity check - debug_assert!(!index.is_empty()); index } From 16112d71b968d3de4e45554f075970cf91ada39d Mon Sep 17 00:00:00 2001 From: ashthespy Date: Thu, 28 May 2020 16:18:41 +0200 Subject: [PATCH 11/26] Search through full playlist for unplayable tracks --- connect/src/spirc.rs | 21 ++++----------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index c6feb728..bb214ad0 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -913,20 +913,7 @@ impl SpircTask { // Mark unavailable tracks so we can skip them later fn handle_unavailable(&mut self, track_id: SpotifyId) { - let playing_index = self.state.get_playing_track_index() as usize; - let mut unavailables = self.get_track_index_for_spotify_id(&track_id, playing_index); - if unavailables.is_empty() { - trace!( - "Couldn't find unavailables searching from {:?} -- {:?}, cycling through entire playlist", - playing_index, - self.state.get_track().len() - ); - // We could just do this everytime, but for most cases it's needless overhead. - // we are still repeating the serach for (playing_index..) in this case - unavailables = self.get_track_index_for_spotify_id(&track_id, 0); - } - // Sanity check - debug_assert!(!unavailables.is_empty()); + let unavailables = self.get_track_index_for_spotify_id(&track_id, 0); for &index in unavailables.iter() { debug_assert_eq!(self.state.get_track()[index].get_gid(), track_id.to_raw()); let mut unplayable_track_ref = TrackRef::new(); @@ -1191,6 +1178,8 @@ impl SpircTask { .filter(|&(_, track_ref)| track_ref.get_gid() == track_id.to_raw()) .map(|(idx, _)| start_index + idx) .collect(); + // Sanity check + debug_assert!(!index.is_empty()); index } @@ -1222,9 +1211,7 @@ impl SpircTask { { warn!( "Skipping track <{:?}> at position [{}] of {}", - track_ref.get_uri(), - new_playlist_index, - tracks_len + track_ref, new_playlist_index, tracks_len ); new_playlist_index += 1; From aaef07e819192b0c204150e8d65eff741fabe1e3 Mon Sep 17 00:00:00 2001 From: sniperrifle2004 Date: Sun, 14 Jun 2020 05:16:59 +0200 Subject: [PATCH 12/26] Introduce an appropriate period for the desired buffer --- playback/src/audio_backend/alsa.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index 8bdcb9d1..c2e06630 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -41,7 +41,8 @@ fn open_device(dev_name: &str) -> Result<(PCM), Box> { hwp.set_format(Format::s16())?; hwp.set_rate(44100, ValueOr::Nearest)?; hwp.set_channels(2)?; - hwp.set_buffer_size_near(22050)?; // ~ 0.5s latency + hwp.set_period_size_near(5512, ValueOr::Nearest)?; // Period of roughly 125ms + hwp.set_buffer_size_near(22048)?; // ~ 0.5s latency pcm.hw_params(&hwp)?; let swp = pcm.sw_params_current()?; From 64081a12bb22d1f6a211a7ddde4176dea3af0579 Mon Sep 17 00:00:00 2001 From: sniperrifle2004 Date: Sun, 14 Jun 2020 05:20:14 +0200 Subject: [PATCH 13/26] Introduce a buffer for a full period Writing to the pcm more often than necessary is just a waste of resources and depending on the pcm it can have quite an impact on performance. The pcm expects full periods anyway. --- playback/src/audio_backend/alsa.rs | 60 ++++++++++++++++++++++-------- 1 file changed, 44 insertions(+), 16 deletions(-) diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index c2e06630..e92ad18e 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -1,12 +1,21 @@ use super::{Open, Sink}; use alsa::device_name::HintIter; -use alsa::pcm::{Access, Format, HwParams, PCM}; +use alsa::pcm::{Access, Format, Frames, HwParams, PCM}; use alsa::{Direction, Error, ValueOr}; +use std::cmp::min; use std::ffi::CString; use std::io; use std::process::exit; -pub struct AlsaSink(Option, String); +const PERIOD_SIZE: usize = 5512; // Period of roughly 125ms +const BUFFERED_PERIODS: usize = 4; // ~ 0.5s latency + +pub struct AlsaSink { + pcm: Option, + device: String, + buffer: [i16; PERIOD_SIZE as usize], + buffered_data: usize, +} fn list_outputs() { for t in &["pcm", "ctl", "hwdep"] { @@ -41,8 +50,8 @@ fn open_device(dev_name: &str) -> Result<(PCM), Box> { hwp.set_format(Format::s16())?; hwp.set_rate(44100, ValueOr::Nearest)?; hwp.set_channels(2)?; - hwp.set_period_size_near(5512, ValueOr::Nearest)?; // Period of roughly 125ms - hwp.set_buffer_size_near(22048)?; // ~ 0.5s latency + hwp.set_period_size_near(PERIOD_SIZE as Frames, ValueOr::Nearest)?; + hwp.set_buffer_size_near((PERIOD_SIZE * BUFFERED_PERIODS) as Frames)?; pcm.hw_params(&hwp)?; let swp = pcm.sw_params_current()?; @@ -68,16 +77,21 @@ impl Open for AlsaSink { } .to_string(); - AlsaSink(None, name) + AlsaSink { + pcm: None, + device: name, + buffer: [0; PERIOD_SIZE], + buffered_data: 0, + } } } impl Sink for AlsaSink { fn start(&mut self) -> io::Result<()> { - if self.0.is_none() { - let pcm = open_device(&self.1); + if self.pcm.is_none() { + let pcm = open_device(&self.device); match pcm { - Ok(p) => self.0 = Some(p), + Ok(p) => self.pcm = Some(p), Err(e) => { error!("Alsa error PCM open {}", e); return Err(io::Error::new( @@ -93,20 +107,34 @@ impl Sink for AlsaSink { fn stop(&mut self) -> io::Result<()> { { - let pcm = self.0.as_ref().unwrap(); + let pcm = self.pcm.as_ref().unwrap(); pcm.drain().unwrap(); } - self.0 = None; + self.pcm = None; Ok(()) } fn write(&mut self, data: &[i16]) -> io::Result<()> { - let pcm = self.0.as_mut().unwrap(); - let io = pcm.io_i16().unwrap(); - - match io.writei(&data) { - Ok(_) => (), - Err(err) => pcm.try_recover(err, false).unwrap(), + let mut processed_data = 0; + while processed_data < data.len() { + let data_to_buffer = min( + PERIOD_SIZE - self.buffered_data, + data.len() - processed_data, + ); + let buffer_slice = + &mut self.buffer[self.buffered_data..self.buffered_data + data_to_buffer]; + buffer_slice.copy_from_slice(&data[processed_data..processed_data + data_to_buffer]); + self.buffered_data += data_to_buffer; + processed_data += data_to_buffer; + if self.buffered_data == PERIOD_SIZE { + self.buffered_data = 0; + let pcm = self.pcm.as_mut().unwrap(); + let io = pcm.io_i16().unwrap(); + match io.writei(&self.buffer) { + Ok(_) => (), + Err(err) => pcm.try_recover(err, false).unwrap(), + } + } } Ok(()) From cbe3c98fa122c0c3214f83e7c8e5044823f31e02 Mon Sep 17 00:00:00 2001 From: sniperrifle2004 Date: Sun, 14 Jun 2020 05:52:16 +0200 Subject: [PATCH 14/26] Clear buffer when the sink is stopped --- playback/src/audio_backend/alsa.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index e92ad18e..086bea33 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -111,6 +111,7 @@ impl Sink for AlsaSink { pcm.drain().unwrap(); } self.pcm = None; + self.buffered_data = 0; Ok(()) } From a68dfa0287790fa5583f41fcf301e25024f4e4f1 Mon Sep 17 00:00:00 2001 From: sniperrifle2004 Date: Sun, 14 Jun 2020 07:17:46 +0200 Subject: [PATCH 15/26] On stop write any chunk(s) left in the period buffer That should prevent a possible sudden stop --- playback/src/audio_backend/alsa.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index 086bea33..01e9fec4 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -107,7 +107,14 @@ impl Sink for AlsaSink { fn stop(&mut self) -> io::Result<()> { { - let pcm = self.pcm.as_ref().unwrap(); + let pcm = self.pcm.as_mut().unwrap(); + // Write any leftover data in the period buffer + // before draining the actual buffer + let io = pcm.io_i16().unwrap(); + match io.writei(&self.buffer[..self.buffered_data]) { + Ok(_) => (), + Err(err) => pcm.try_recover(err, false).unwrap(), + } pcm.drain().unwrap(); } self.pcm = None; From 82e54dfaba32cfc5d024781b1eb72716abc2549b Mon Sep 17 00:00:00 2001 From: sniperrifle2004 Date: Wed, 17 Jun 2020 03:34:46 +0200 Subject: [PATCH 16/26] Rewrite buffer around the actual period size This prevents over or underestimating of the period. While it is unlikely, with comparitively small period sizes overestimating can cause buffer underruns and underestimating causes more writes than necessary. It also properly accounts for the number of channels, which I had overlooked. --- playback/src/audio_backend/alsa.rs | 40 +++++++++++++++--------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index 01e9fec4..156123ca 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -7,14 +7,13 @@ use std::ffi::CString; use std::io; use std::process::exit; -const PERIOD_SIZE: usize = 5512; // Period of roughly 125ms -const BUFFERED_PERIODS: usize = 4; // ~ 0.5s latency +const PREFERED_PERIOD_SIZE: Frames = 5512; // Period of roughly 125ms +const BUFFERED_PERIODS: Frames = 4; pub struct AlsaSink { pcm: Option, device: String, - buffer: [i16; PERIOD_SIZE as usize], - buffered_data: usize, + buffer: Vec, } fn list_outputs() { @@ -34,8 +33,9 @@ fn list_outputs() { } } -fn open_device(dev_name: &str) -> Result<(PCM), Box> { +fn open_device(dev_name: &str) -> Result<(PCM, Frames), Box> { let pcm = PCM::new(dev_name, Direction::Playback, false)?; + let period_size = PREFERED_PERIOD_SIZE; // http://www.linuxjournal.com/article/6735?page=0,1#N0x19ab2890.0x19ba78d8 // latency = period_size * periods / (rate * bytes_per_frame) // For 16 Bit stereo data, one frame has a length of four bytes. @@ -50,8 +50,8 @@ fn open_device(dev_name: &str) -> Result<(PCM), Box> { hwp.set_format(Format::s16())?; hwp.set_rate(44100, ValueOr::Nearest)?; hwp.set_channels(2)?; - hwp.set_period_size_near(PERIOD_SIZE as Frames, ValueOr::Nearest)?; - hwp.set_buffer_size_near((PERIOD_SIZE * BUFFERED_PERIODS) as Frames)?; + let period_size = hwp.set_period_size_near(period_size, ValueOr::Greater)?; + hwp.set_buffer_size_near(period_size * BUFFERED_PERIODS)?; pcm.hw_params(&hwp)?; let swp = pcm.sw_params_current()?; @@ -59,7 +59,7 @@ fn open_device(dev_name: &str) -> Result<(PCM), Box> { pcm.sw_params(&swp)?; } - Ok(pcm) + Ok((pcm, period_size)) } impl Open for AlsaSink { @@ -80,8 +80,7 @@ impl Open for AlsaSink { AlsaSink { pcm: None, device: name, - buffer: [0; PERIOD_SIZE], - buffered_data: 0, + buffer: vec![], } } } @@ -91,7 +90,11 @@ impl Sink for AlsaSink { if self.pcm.is_none() { let pcm = open_device(&self.device); match pcm { - Ok(p) => self.pcm = Some(p), + Ok((p, period_size)) => { + self.pcm = Some(p); + // Create a buffer for all samples for a full period + self.buffer = Vec::with_capacity((period_size * 2) as usize); + } Err(e) => { error!("Alsa error PCM open {}", e); return Err(io::Error::new( @@ -111,14 +114,13 @@ impl Sink for AlsaSink { // Write any leftover data in the period buffer // before draining the actual buffer let io = pcm.io_i16().unwrap(); - match io.writei(&self.buffer[..self.buffered_data]) { + match io.writei(&self.buffer[..]) { Ok(_) => (), Err(err) => pcm.try_recover(err, false).unwrap(), } pcm.drain().unwrap(); } self.pcm = None; - self.buffered_data = 0; Ok(()) } @@ -126,22 +128,20 @@ impl Sink for AlsaSink { let mut processed_data = 0; while processed_data < data.len() { let data_to_buffer = min( - PERIOD_SIZE - self.buffered_data, + self.buffer.capacity() - self.buffer.len(), data.len() - processed_data, ); - let buffer_slice = - &mut self.buffer[self.buffered_data..self.buffered_data + data_to_buffer]; - buffer_slice.copy_from_slice(&data[processed_data..processed_data + data_to_buffer]); - self.buffered_data += data_to_buffer; + self.buffer + .extend_from_slice(&data[processed_data..processed_data + data_to_buffer]); processed_data += data_to_buffer; - if self.buffered_data == PERIOD_SIZE { - self.buffered_data = 0; + if self.buffer.len() == self.buffer.capacity() { let pcm = self.pcm.as_mut().unwrap(); let io = pcm.io_i16().unwrap(); match io.writei(&self.buffer) { Ok(_) => (), Err(err) => pcm.try_recover(err, false).unwrap(), } + self.buffer.clear(); } } From 1e5d98b8fdd23e3e739b5fdb2ff59d45e12a0409 Mon Sep 17 00:00:00 2001 From: sniperrifle2004 Date: Wed, 17 Jun 2020 03:53:20 +0200 Subject: [PATCH 17/26] Actually store the period_size --- playback/src/audio_backend/alsa.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/playback/src/audio_backend/alsa.rs b/playback/src/audio_backend/alsa.rs index 156123ca..ae76f057 100644 --- a/playback/src/audio_backend/alsa.rs +++ b/playback/src/audio_backend/alsa.rs @@ -35,7 +35,7 @@ fn list_outputs() { fn open_device(dev_name: &str) -> Result<(PCM, Frames), Box> { let pcm = PCM::new(dev_name, Direction::Playback, false)?; - let period_size = PREFERED_PERIOD_SIZE; + let mut period_size = PREFERED_PERIOD_SIZE; // http://www.linuxjournal.com/article/6735?page=0,1#N0x19ab2890.0x19ba78d8 // latency = period_size * periods / (rate * bytes_per_frame) // For 16 Bit stereo data, one frame has a length of four bytes. @@ -50,7 +50,7 @@ fn open_device(dev_name: &str) -> Result<(PCM, Frames), Box> { hwp.set_format(Format::s16())?; hwp.set_rate(44100, ValueOr::Nearest)?; hwp.set_channels(2)?; - let period_size = hwp.set_period_size_near(period_size, ValueOr::Greater)?; + period_size = hwp.set_period_size_near(period_size, ValueOr::Greater)?; hwp.set_buffer_size_near(period_size * BUFFERED_PERIODS)?; pcm.hw_params(&hwp)?; From 9f3a02ee8f62f8e178f714c3c63132388d90af64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=85ke?= Date: Mon, 22 Jun 2020 16:36:36 +0200 Subject: [PATCH 18/26] Update package.metadata.deb to modern standards (#498) Change underscores to dashes to conform with cargo-deb specifications. --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9507feb0..3e7019eb 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -76,9 +76,9 @@ default = ["librespot-playback/rodio-backend"] [package.metadata.deb] maintainer = "librespot-org" copyright = "2018 Paul Liétar" -license_file = ["LICENSE", "4"] +license-file = ["LICENSE", "4"] depends = "$auto" -extended_description = """\ +extended-description = """\ librespot is an open source client library for Spotify. It enables applications \ to use Spotify's service, without using the official but closed-source \ libspotify. Additionally, it will provide extra features which are not \ From 72437bff665883eaef6bf56cf28699c16d3ec48c Mon Sep 17 00:00:00 2001 From: Ash Date: Wed, 22 Jul 2020 12:47:25 +0200 Subject: [PATCH 19/26] Bump protobuf v2.8.1 -> v~2.14.0 and fix build issues (#485) --- Cargo.lock | 32 +- Cargo.toml | 2 +- connect/Cargo.toml | 2 +- core/Cargo.toml | 2 +- metadata/Cargo.toml | 2 +- protocol/Cargo.toml | 6 +- protocol/build.rs | 13 +- protocol/src/authentication.rs | 333 +++++++------------- protocol/src/keyexchange.rs | 520 ++++++++++--------------------- protocol/src/mercury.rs | 118 +++---- protocol/src/metadata.rs | 462 +++++++++------------------ protocol/src/playlist4changes.rs | 166 ++++------ protocol/src/playlist4content.rs | 75 ++--- protocol/src/playlist4issues.rs | 87 ++---- protocol/src/playlist4meta.rs | 118 +++---- protocol/src/playlist4ops.rs | 188 ++++------- protocol/src/pubsub.rs | 27 +- protocol/src/spirc.rs | 172 ++++------ 18 files changed, 764 insertions(+), 1561 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e2ad8883..f1df8cc4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -793,7 +793,7 @@ dependencies = [ "librespot-protocol 0.1.1", "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -840,7 +840,7 @@ dependencies = [ "librespot-protocol 0.1.1", "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", @@ -871,7 +871,7 @@ dependencies = [ "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", @@ -896,7 +896,7 @@ dependencies = [ "librespot-protocol 0.1.1", "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -924,9 +924,9 @@ dependencies = [ name = "librespot-protocol" version = "0.1.1" dependencies = [ - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf-codegen-pure 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1311,24 +1311,24 @@ dependencies = [ [[package]] name = "protobuf" -version = "2.8.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "protobuf-codegen" -version = "2.8.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "protobuf-codegen-pure" -version = "2.8.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", + "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2455,9 +2455,9 @@ dependencies = [ "checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" "checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" "checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" -"checksum protobuf 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "40361836defdd5871ff7e84096c6f6444af7fc157f8ef1789f54f147687caa20" -"checksum protobuf-codegen 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "12c6abd78435445fc86898ebbd0521a68438063d4a73e23527b7134e6bf58b4a" -"checksum protobuf-codegen-pure 2.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c1646acda5319f5b28b0bff4a484324df43ddae2c0f5a3f3e63c0b26095cd600" +"checksum protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" +"checksum protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c" +"checksum protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440" "checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" "checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" "checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" diff --git a/Cargo.toml b/Cargo.toml index 3e7019eb..ab03332d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -47,7 +47,7 @@ getopts = "0.2" hyper = "0.11" log = "0.4" num-bigint = "0.2" -protobuf = "2.8.1" +protobuf = "~2.14.0" rand = "0.7" rpassword = "3.0" tokio-core = "0.1" diff --git a/connect/Cargo.toml b/connect/Cargo.toml index 469ee85e..8be8ec6d 100644 --- a/connect/Cargo.toml +++ b/connect/Cargo.toml @@ -22,7 +22,7 @@ futures = "0.1" hyper = "0.11" log = "0.4" num-bigint = "0.2" -protobuf = "2.8.1" +protobuf = "~2.14.0" rand = "0.7" serde = "1.0" serde_derive = "1.0" diff --git a/core/Cargo.toml b/core/Cargo.toml index e01c9863..ac3418cc 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -25,7 +25,7 @@ log = "0.4" num-bigint = "0.2" num-integer = "0.1" num-traits = "0.2" -protobuf = "2.8.1" +protobuf = "~2.14.0" rand = "0.7" serde = "1.0" serde_derive = "1.0" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index 328ba06e..40ebe4b8 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -10,7 +10,7 @@ edition = "2018" byteorder = "1.3" futures = "0.1" linear-map = "1.2" -protobuf = "2.8.1" +protobuf = "~2.14.0" log = "0.4" [dependencies.librespot-core] diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml index fa6355fe..683f8dae 100644 --- a/protocol/Cargo.toml +++ b/protocol/Cargo.toml @@ -8,8 +8,8 @@ license="MIT" edition = "2018" [dependencies] -protobuf = "~2.8.1" +protobuf = "~2.14.0" [build-dependencies] -protobuf-codegen-pure = "~2.8.1" -protobuf-codegen = "~2.8.1" +protobuf-codegen-pure = "~2.14.0" +protobuf-codegen = "~2.14.0" diff --git a/protocol/build.rs b/protocol/build.rs index 3ea25e75..de0b03ba 100644 --- a/protocol/build.rs +++ b/protocol/build.rs @@ -29,20 +29,21 @@ fn main() { } // Build the paths to relevant files. - let src = &format!("proto/{}.proto", name); - let dest = &format!("src/{}.rs", name); - + let src_fname = &format!("proto/{}.proto", name); + let dest_fname = &format!("src/{}.rs", name); + let src = Path::new(src_fname); + let dest = Path::new(dest_fname); // Get the contents of the existing generated file. let mut existing = "".to_string(); - if Path::new(dest).exists() { + if dest.exists() { // Removing CRLF line endings if present. existing = read_to_string(dest).unwrap().replace("\r\n", "\n"); } - println!("Regenerating {} from {}", dest, src); + println!("Regenerating {} from {}", dest.display(), src.display()); // Parse the proto files as the protobuf-codegen-pure crate does. - let p = parse_and_typecheck(&["proto"], &[src]).expect("protoc"); + let p = parse_and_typecheck(&[&Path::new("proto")], &[src]).expect("protoc"); // But generate them with the protobuf-codegen crate directly. // Then we can keep the result in-memory. let result = protobuf_codegen::gen(&p.file_descriptors, &p.relative_paths, &customizations); diff --git a/protocol/src/authentication.rs b/protocol/src/authentication.rs index ca282991..2dc30125 100644 --- a/protocol/src/authentication.rs +++ b/protocol/src/authentication.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct ClientResponseEncrypted { @@ -541,10 +541,7 @@ impl ::protobuf::Message for ClientResponseEncrypted { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -593,7 +590,7 @@ impl ::protobuf::Message for ClientResponseEncrypted { |m: &ClientResponseEncrypted| { &m.client_info }, |m: &mut ClientResponseEncrypted| { &mut m.client_info }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientResponseEncrypted", fields, file_descriptor_proto() @@ -603,10 +600,7 @@ impl ::protobuf::Message for ClientResponseEncrypted { } fn default_instance() -> &'static ClientResponseEncrypted { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientResponseEncrypted, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientResponseEncrypted::new) } @@ -635,8 +629,8 @@ impl ::std::fmt::Debug for ClientResponseEncrypted { } impl ::protobuf::reflect::ProtobufValue for ClientResponseEncrypted { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -846,10 +840,7 @@ impl ::protobuf::Message for LoginCredentials { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -868,7 +859,7 @@ impl ::protobuf::Message for LoginCredentials { |m: &LoginCredentials| { &m.auth_data }, |m: &mut LoginCredentials| { &mut m.auth_data }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCredentials", fields, file_descriptor_proto() @@ -878,10 +869,7 @@ impl ::protobuf::Message for LoginCredentials { } fn default_instance() -> &'static LoginCredentials { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCredentials, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCredentials::new) } @@ -904,8 +892,8 @@ impl ::std::fmt::Debug for LoginCredentials { } impl ::protobuf::reflect::ProtobufValue for LoginCredentials { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1093,10 +1081,7 @@ impl ::protobuf::Message for FingerprintResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1110,7 +1095,7 @@ impl ::protobuf::Message for FingerprintResponseUnion { |m: &FingerprintResponseUnion| { &m.hmac_ripemd }, |m: &mut FingerprintResponseUnion| { &mut m.hmac_ripemd }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintResponseUnion", fields, file_descriptor_proto() @@ -1120,10 +1105,7 @@ impl ::protobuf::Message for FingerprintResponseUnion { } fn default_instance() -> &'static FingerprintResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FingerprintResponseUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FingerprintResponseUnion::new) } @@ -1145,8 +1127,8 @@ impl ::std::fmt::Debug for FingerprintResponseUnion { } impl ::protobuf::reflect::ProtobufValue for FingerprintResponseUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1281,10 +1263,7 @@ impl ::protobuf::Message for FingerprintGrainResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1293,7 +1272,7 @@ impl ::protobuf::Message for FingerprintGrainResponse { |m: &FingerprintGrainResponse| { &m.encrypted_key }, |m: &mut FingerprintGrainResponse| { &mut m.encrypted_key }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintGrainResponse", fields, file_descriptor_proto() @@ -1303,10 +1282,7 @@ impl ::protobuf::Message for FingerprintGrainResponse { } fn default_instance() -> &'static FingerprintGrainResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FingerprintGrainResponse, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FingerprintGrainResponse::new) } @@ -1327,8 +1303,8 @@ impl ::std::fmt::Debug for FingerprintGrainResponse { } impl ::protobuf::reflect::ProtobufValue for FingerprintGrainResponse { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1463,10 +1439,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1475,7 +1448,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { |m: &FingerprintHmacRipemdResponse| { &m.hmac }, |m: &mut FingerprintHmacRipemdResponse| { &mut m.hmac }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintHmacRipemdResponse", fields, file_descriptor_proto() @@ -1485,10 +1458,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { } fn default_instance() -> &'static FingerprintHmacRipemdResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FingerprintHmacRipemdResponse, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FingerprintHmacRipemdResponse::new) } @@ -1509,8 +1479,8 @@ impl ::std::fmt::Debug for FingerprintHmacRipemdResponse { } impl ::protobuf::reflect::ProtobufValue for FingerprintHmacRipemdResponse { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1698,10 +1668,7 @@ impl ::protobuf::Message for PeerTicketUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1715,7 +1682,7 @@ impl ::protobuf::Message for PeerTicketUnion { |m: &PeerTicketUnion| { &m.old_ticket }, |m: &mut PeerTicketUnion| { &mut m.old_ticket }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PeerTicketUnion", fields, file_descriptor_proto() @@ -1725,10 +1692,7 @@ impl ::protobuf::Message for PeerTicketUnion { } fn default_instance() -> &'static PeerTicketUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PeerTicketUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PeerTicketUnion::new) } @@ -1750,8 +1714,8 @@ impl ::std::fmt::Debug for PeerTicketUnion { } impl ::protobuf::reflect::ProtobufValue for PeerTicketUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1886,10 +1850,7 @@ impl ::protobuf::Message for PeerTicketPublicKey { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1898,7 +1859,7 @@ impl ::protobuf::Message for PeerTicketPublicKey { |m: &PeerTicketPublicKey| { &m.public_key }, |m: &mut PeerTicketPublicKey| { &mut m.public_key }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PeerTicketPublicKey", fields, file_descriptor_proto() @@ -1908,10 +1869,7 @@ impl ::protobuf::Message for PeerTicketPublicKey { } fn default_instance() -> &'static PeerTicketPublicKey { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PeerTicketPublicKey, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PeerTicketPublicKey::new) } @@ -1932,8 +1890,8 @@ impl ::std::fmt::Debug for PeerTicketPublicKey { } impl ::protobuf::reflect::ProtobufValue for PeerTicketPublicKey { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2117,10 +2075,7 @@ impl ::protobuf::Message for PeerTicketOld { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2134,7 +2089,7 @@ impl ::protobuf::Message for PeerTicketOld { |m: &PeerTicketOld| { &m.peer_ticket_signature }, |m: &mut PeerTicketOld| { &mut m.peer_ticket_signature }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PeerTicketOld", fields, file_descriptor_proto() @@ -2144,10 +2099,7 @@ impl ::protobuf::Message for PeerTicketOld { } fn default_instance() -> &'static PeerTicketOld { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PeerTicketOld, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PeerTicketOld::new) } @@ -2169,8 +2121,8 @@ impl ::std::fmt::Debug for PeerTicketOld { } impl ::protobuf::reflect::ProtobufValue for PeerTicketOld { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2606,10 +2558,7 @@ impl ::protobuf::Message for SystemInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2663,7 +2612,7 @@ impl ::protobuf::Message for SystemInfo { |m: &SystemInfo| { &m.device_id }, |m: &mut SystemInfo| { &mut m.device_id }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "SystemInfo", fields, file_descriptor_proto() @@ -2673,10 +2622,7 @@ impl ::protobuf::Message for SystemInfo { } fn default_instance() -> &'static SystemInfo { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const SystemInfo, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(SystemInfo::new) } @@ -2706,8 +2652,8 @@ impl ::std::fmt::Debug for SystemInfo { } impl ::protobuf::reflect::ProtobufValue for SystemInfo { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3025,10 +2971,7 @@ impl ::protobuf::Message for LibspotifyAppKey { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3057,7 +3000,7 @@ impl ::protobuf::Message for LibspotifyAppKey { |m: &LibspotifyAppKey| { &m.callback_hash }, |m: &mut LibspotifyAppKey| { &mut m.callback_hash }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LibspotifyAppKey", fields, file_descriptor_proto() @@ -3067,10 +3010,7 @@ impl ::protobuf::Message for LibspotifyAppKey { } fn default_instance() -> &'static LibspotifyAppKey { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LibspotifyAppKey, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LibspotifyAppKey::new) } @@ -3095,8 +3035,8 @@ impl ::std::fmt::Debug for LibspotifyAppKey { } impl ::protobuf::reflect::ProtobufValue for LibspotifyAppKey { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3312,10 +3252,7 @@ impl ::protobuf::Message for ClientInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3334,7 +3271,7 @@ impl ::protobuf::Message for ClientInfo { |m: &ClientInfo| { &m.language }, |m: &mut ClientInfo| { &mut m.language }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientInfo", fields, file_descriptor_proto() @@ -3344,10 +3281,7 @@ impl ::protobuf::Message for ClientInfo { } fn default_instance() -> &'static ClientInfo { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientInfo, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientInfo::new) } @@ -3370,8 +3304,8 @@ impl ::std::fmt::Debug for ClientInfo { } impl ::protobuf::reflect::ProtobufValue for ClientInfo { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3503,10 +3437,7 @@ impl ::protobuf::Message for ClientInfoFacebook { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3515,7 +3446,7 @@ impl ::protobuf::Message for ClientInfoFacebook { |m: &ClientInfoFacebook| { &m.machine_id }, |m: &mut ClientInfoFacebook| { &mut m.machine_id }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientInfoFacebook", fields, file_descriptor_proto() @@ -3525,10 +3456,7 @@ impl ::protobuf::Message for ClientInfoFacebook { } fn default_instance() -> &'static ClientInfoFacebook { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientInfoFacebook, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientInfoFacebook::new) } @@ -3549,8 +3477,8 @@ impl ::std::fmt::Debug for ClientInfoFacebook { } impl ::protobuf::reflect::ProtobufValue for ClientInfoFacebook { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3978,10 +3906,7 @@ impl ::protobuf::Message for APWelcome { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4025,7 +3950,7 @@ impl ::protobuf::Message for APWelcome { |m: &APWelcome| { &m.fb }, |m: &mut APWelcome| { &mut m.fb }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APWelcome", fields, file_descriptor_proto() @@ -4035,10 +3960,7 @@ impl ::protobuf::Message for APWelcome { } fn default_instance() -> &'static APWelcome { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const APWelcome, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(APWelcome::new) } @@ -4066,8 +3988,8 @@ impl ::std::fmt::Debug for APWelcome { } impl ::protobuf::reflect::ProtobufValue for APWelcome { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4255,10 +4177,7 @@ impl ::protobuf::Message for AccountInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4272,7 +4191,7 @@ impl ::protobuf::Message for AccountInfo { |m: &AccountInfo| { &m.facebook }, |m: &mut AccountInfo| { &mut m.facebook }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AccountInfo", fields, file_descriptor_proto() @@ -4282,10 +4201,7 @@ impl ::protobuf::Message for AccountInfo { } fn default_instance() -> &'static AccountInfo { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const AccountInfo, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(AccountInfo::new) } @@ -4307,8 +4223,8 @@ impl ::std::fmt::Debug for AccountInfo { } impl ::protobuf::reflect::ProtobufValue for AccountInfo { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4393,14 +4309,11 @@ impl ::protobuf::Message for AccountInfoSpotify { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AccountInfoSpotify", fields, file_descriptor_proto() @@ -4410,10 +4323,7 @@ impl ::protobuf::Message for AccountInfoSpotify { } fn default_instance() -> &'static AccountInfoSpotify { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const AccountInfoSpotify, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(AccountInfoSpotify::new) } @@ -4433,8 +4343,8 @@ impl ::std::fmt::Debug for AccountInfoSpotify { } impl ::protobuf::reflect::ProtobufValue for AccountInfoSpotify { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4612,10 +4522,7 @@ impl ::protobuf::Message for AccountInfoFacebook { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4629,7 +4536,7 @@ impl ::protobuf::Message for AccountInfoFacebook { |m: &AccountInfoFacebook| { &m.machine_id }, |m: &mut AccountInfoFacebook| { &mut m.machine_id }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AccountInfoFacebook", fields, file_descriptor_proto() @@ -4639,10 +4546,7 @@ impl ::protobuf::Message for AccountInfoFacebook { } fn default_instance() -> &'static AccountInfoFacebook { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const AccountInfoFacebook, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(AccountInfoFacebook::new) } @@ -4664,8 +4568,8 @@ impl ::std::fmt::Debug for AccountInfoFacebook { } impl ::protobuf::reflect::ProtobufValue for AccountInfoFacebook { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4706,13 +4610,10 @@ impl ::protobuf::ProtobufEnum for AuthenticationType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("AuthenticationType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("AuthenticationType", file_descriptor_proto()) }) } } @@ -4728,8 +4629,8 @@ impl ::std::default::Default for AuthenticationType { } impl ::protobuf::reflect::ProtobufValue for AuthenticationType { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -4761,13 +4662,10 @@ impl ::protobuf::ProtobufEnum for AccountCreation { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("AccountCreation", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("AccountCreation", file_descriptor_proto()) }) } } @@ -4784,8 +4682,8 @@ impl ::std::default::Default for AccountCreation { } impl ::protobuf::reflect::ProtobufValue for AccountCreation { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -4841,13 +4739,10 @@ impl ::protobuf::ProtobufEnum for CpuFamily { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("CpuFamily", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("CpuFamily", file_descriptor_proto()) }) } } @@ -4863,8 +4758,8 @@ impl ::std::default::Default for CpuFamily { } impl ::protobuf::reflect::ProtobufValue for CpuFamily { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -4902,13 +4797,10 @@ impl ::protobuf::ProtobufEnum for Brand { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Brand", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Brand", file_descriptor_proto()) }) } } @@ -4924,8 +4816,8 @@ impl ::std::default::Default for Brand { } impl ::protobuf::reflect::ProtobufValue for Brand { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -5020,13 +4912,10 @@ impl ::protobuf::ProtobufEnum for Os { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Os", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Os", file_descriptor_proto()) }) } } @@ -5042,8 +4931,8 @@ impl ::std::default::Default for Os { } impl ::protobuf::reflect::ProtobufValue for Os { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -5075,13 +4964,10 @@ impl ::protobuf::ProtobufEnum for AccountType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("AccountType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("AccountType", file_descriptor_proto()) }) } } @@ -5097,8 +4983,8 @@ impl ::std::default::Default for AccountType { } impl ::protobuf::reflect::ProtobufValue for AccountType { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -5176,10 +5062,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x10\0\x12\x0c\n\x08Facebook\x10\x01\x1a\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/keyexchange.rs b/protocol/src/keyexchange.rs index f6cec4dd..cfe1aec3 100644 --- a/protocol/src/keyexchange.rs +++ b/protocol/src/keyexchange.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct ClientHello { @@ -467,10 +467,7 @@ impl ::protobuf::Message for ClientHello { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -514,7 +511,7 @@ impl ::protobuf::Message for ClientHello { |m: &ClientHello| { &m.feature_set }, |m: &mut ClientHello| { &mut m.feature_set }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientHello", fields, file_descriptor_proto() @@ -524,10 +521,7 @@ impl ::protobuf::Message for ClientHello { } fn default_instance() -> &'static ClientHello { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientHello, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientHello::new) } @@ -555,8 +549,8 @@ impl ::std::fmt::Debug for ClientHello { } impl ::protobuf::reflect::ProtobufValue for ClientHello { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -777,10 +771,7 @@ impl ::protobuf::Message for BuildInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -804,7 +795,7 @@ impl ::protobuf::Message for BuildInfo { |m: &BuildInfo| { &m.version }, |m: &mut BuildInfo| { &mut m.version }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "BuildInfo", fields, file_descriptor_proto() @@ -814,10 +805,7 @@ impl ::protobuf::Message for BuildInfo { } fn default_instance() -> &'static BuildInfo { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const BuildInfo, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(BuildInfo::new) } @@ -841,8 +829,8 @@ impl ::std::fmt::Debug for BuildInfo { } impl ::protobuf::reflect::ProtobufValue for BuildInfo { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -979,10 +967,7 @@ impl ::protobuf::Message for LoginCryptoHelloUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -991,7 +976,7 @@ impl ::protobuf::Message for LoginCryptoHelloUnion { |m: &LoginCryptoHelloUnion| { &m.diffie_hellman }, |m: &mut LoginCryptoHelloUnion| { &mut m.diffie_hellman }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoHelloUnion", fields, file_descriptor_proto() @@ -1001,10 +986,7 @@ impl ::protobuf::Message for LoginCryptoHelloUnion { } fn default_instance() -> &'static LoginCryptoHelloUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCryptoHelloUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCryptoHelloUnion::new) } @@ -1025,8 +1007,8 @@ impl ::std::fmt::Debug for LoginCryptoHelloUnion { } impl ::protobuf::reflect::ProtobufValue for LoginCryptoHelloUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1197,10 +1179,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1214,7 +1193,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { |m: &LoginCryptoDiffieHellmanHello| { &m.server_keys_known }, |m: &mut LoginCryptoDiffieHellmanHello| { &mut m.server_keys_known }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoDiffieHellmanHello", fields, file_descriptor_proto() @@ -1224,10 +1203,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { } fn default_instance() -> &'static LoginCryptoDiffieHellmanHello { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCryptoDiffieHellmanHello, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCryptoDiffieHellmanHello::new) } @@ -1249,8 +1225,8 @@ impl ::std::fmt::Debug for LoginCryptoDiffieHellmanHello { } impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanHello { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1402,10 +1378,7 @@ impl ::protobuf::Message for FeatureSet { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1419,7 +1392,7 @@ impl ::protobuf::Message for FeatureSet { |m: &FeatureSet| { &m.current_location }, |m: &mut FeatureSet| { &mut m.current_location }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FeatureSet", fields, file_descriptor_proto() @@ -1429,10 +1402,7 @@ impl ::protobuf::Message for FeatureSet { } fn default_instance() -> &'static FeatureSet { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FeatureSet, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FeatureSet::new) } @@ -1454,8 +1424,8 @@ impl ::std::fmt::Debug for FeatureSet { } impl ::protobuf::reflect::ProtobufValue for FeatureSet { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1694,10 +1664,7 @@ impl ::protobuf::Message for APResponseMessage { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1716,7 +1683,7 @@ impl ::protobuf::Message for APResponseMessage { |m: &APResponseMessage| { &m.login_failed }, |m: &mut APResponseMessage| { &mut m.login_failed }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APResponseMessage", fields, file_descriptor_proto() @@ -1726,10 +1693,7 @@ impl ::protobuf::Message for APResponseMessage { } fn default_instance() -> &'static APResponseMessage { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const APResponseMessage, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(APResponseMessage::new) } @@ -1752,8 +1716,8 @@ impl ::std::fmt::Debug for APResponseMessage { } impl ::protobuf::reflect::ProtobufValue for APResponseMessage { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2150,10 +2114,7 @@ impl ::protobuf::Message for APChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2187,7 +2148,7 @@ impl ::protobuf::Message for APChallenge { |m: &APChallenge| { &m.padding }, |m: &mut APChallenge| { &mut m.padding }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APChallenge", fields, file_descriptor_proto() @@ -2197,10 +2158,7 @@ impl ::protobuf::Message for APChallenge { } fn default_instance() -> &'static APChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const APChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(APChallenge::new) } @@ -2226,8 +2184,8 @@ impl ::std::fmt::Debug for APChallenge { } impl ::protobuf::reflect::ProtobufValue for APChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2364,10 +2322,7 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2376,7 +2331,7 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion { |m: &LoginCryptoChallengeUnion| { &m.diffie_hellman }, |m: &mut LoginCryptoChallengeUnion| { &mut m.diffie_hellman }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoChallengeUnion", fields, file_descriptor_proto() @@ -2386,10 +2341,7 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion { } fn default_instance() -> &'static LoginCryptoChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCryptoChallengeUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCryptoChallengeUnion::new) } @@ -2410,8 +2362,8 @@ impl ::std::fmt::Debug for LoginCryptoChallengeUnion { } impl ::protobuf::reflect::ProtobufValue for LoginCryptoChallengeUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2631,10 +2583,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2653,7 +2602,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge { |m: &LoginCryptoDiffieHellmanChallenge| { &m.gs_signature }, |m: &mut LoginCryptoDiffieHellmanChallenge| { &mut m.gs_signature }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoDiffieHellmanChallenge", fields, file_descriptor_proto() @@ -2663,10 +2612,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge { } fn default_instance() -> &'static LoginCryptoDiffieHellmanChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCryptoDiffieHellmanChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCryptoDiffieHellmanChallenge::new) } @@ -2689,8 +2635,8 @@ impl ::std::fmt::Debug for LoginCryptoDiffieHellmanChallenge { } impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2878,10 +2824,7 @@ impl ::protobuf::Message for FingerprintChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2895,7 +2838,7 @@ impl ::protobuf::Message for FingerprintChallengeUnion { |m: &FingerprintChallengeUnion| { &m.hmac_ripemd }, |m: &mut FingerprintChallengeUnion| { &mut m.hmac_ripemd }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintChallengeUnion", fields, file_descriptor_proto() @@ -2905,10 +2848,7 @@ impl ::protobuf::Message for FingerprintChallengeUnion { } fn default_instance() -> &'static FingerprintChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FingerprintChallengeUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FingerprintChallengeUnion::new) } @@ -2930,8 +2870,8 @@ impl ::std::fmt::Debug for FingerprintChallengeUnion { } impl ::protobuf::reflect::ProtobufValue for FingerprintChallengeUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3066,10 +3006,7 @@ impl ::protobuf::Message for FingerprintGrainChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3078,7 +3015,7 @@ impl ::protobuf::Message for FingerprintGrainChallenge { |m: &FingerprintGrainChallenge| { &m.kek }, |m: &mut FingerprintGrainChallenge| { &mut m.kek }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintGrainChallenge", fields, file_descriptor_proto() @@ -3088,10 +3025,7 @@ impl ::protobuf::Message for FingerprintGrainChallenge { } fn default_instance() -> &'static FingerprintGrainChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FingerprintGrainChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FingerprintGrainChallenge::new) } @@ -3112,8 +3046,8 @@ impl ::std::fmt::Debug for FingerprintGrainChallenge { } impl ::protobuf::reflect::ProtobufValue for FingerprintGrainChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3248,10 +3182,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3260,7 +3191,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { |m: &FingerprintHmacRipemdChallenge| { &m.challenge }, |m: &mut FingerprintHmacRipemdChallenge| { &mut m.challenge }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintHmacRipemdChallenge", fields, file_descriptor_proto() @@ -3270,10 +3201,7 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { } fn default_instance() -> &'static FingerprintHmacRipemdChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const FingerprintHmacRipemdChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(FingerprintHmacRipemdChallenge::new) } @@ -3294,8 +3222,8 @@ impl ::std::fmt::Debug for FingerprintHmacRipemdChallenge { } impl ::protobuf::reflect::ProtobufValue for FingerprintHmacRipemdChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3432,10 +3360,7 @@ impl ::protobuf::Message for PoWChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3444,7 +3369,7 @@ impl ::protobuf::Message for PoWChallengeUnion { |m: &PoWChallengeUnion| { &m.hash_cash }, |m: &mut PoWChallengeUnion| { &mut m.hash_cash }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWChallengeUnion", fields, file_descriptor_proto() @@ -3454,10 +3379,7 @@ impl ::protobuf::Message for PoWChallengeUnion { } fn default_instance() -> &'static PoWChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PoWChallengeUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PoWChallengeUnion::new) } @@ -3478,8 +3400,8 @@ impl ::std::fmt::Debug for PoWChallengeUnion { } impl ::protobuf::reflect::ProtobufValue for PoWChallengeUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3677,10 +3599,7 @@ impl ::protobuf::Message for PoWHashCashChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3699,7 +3618,7 @@ impl ::protobuf::Message for PoWHashCashChallenge { |m: &PoWHashCashChallenge| { &m.target }, |m: &mut PoWHashCashChallenge| { &mut m.target }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWHashCashChallenge", fields, file_descriptor_proto() @@ -3709,10 +3628,7 @@ impl ::protobuf::Message for PoWHashCashChallenge { } fn default_instance() -> &'static PoWHashCashChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PoWHashCashChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PoWHashCashChallenge::new) } @@ -3735,8 +3651,8 @@ impl ::std::fmt::Debug for PoWHashCashChallenge { } impl ::protobuf::reflect::ProtobufValue for PoWHashCashChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3924,10 +3840,7 @@ impl ::protobuf::Message for CryptoChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3941,7 +3854,7 @@ impl ::protobuf::Message for CryptoChallengeUnion { |m: &CryptoChallengeUnion| { &m.rc4_sha1_hmac }, |m: &mut CryptoChallengeUnion| { &mut m.rc4_sha1_hmac }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoChallengeUnion", fields, file_descriptor_proto() @@ -3951,10 +3864,7 @@ impl ::protobuf::Message for CryptoChallengeUnion { } fn default_instance() -> &'static CryptoChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const CryptoChallengeUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(CryptoChallengeUnion::new) } @@ -3976,8 +3886,8 @@ impl ::std::fmt::Debug for CryptoChallengeUnion { } impl ::protobuf::reflect::ProtobufValue for CryptoChallengeUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4062,14 +3972,11 @@ impl ::protobuf::Message for CryptoShannonChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoShannonChallenge", fields, file_descriptor_proto() @@ -4079,10 +3986,7 @@ impl ::protobuf::Message for CryptoShannonChallenge { } fn default_instance() -> &'static CryptoShannonChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const CryptoShannonChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(CryptoShannonChallenge::new) } @@ -4102,8 +4006,8 @@ impl ::std::fmt::Debug for CryptoShannonChallenge { } impl ::protobuf::reflect::ProtobufValue for CryptoShannonChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4188,14 +4092,11 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoRc4Sha1HmacChallenge", fields, file_descriptor_proto() @@ -4205,10 +4106,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge { } fn default_instance() -> &'static CryptoRc4Sha1HmacChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const CryptoRc4Sha1HmacChallenge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(CryptoRc4Sha1HmacChallenge::new) } @@ -4228,8 +4126,8 @@ impl ::std::fmt::Debug for CryptoRc4Sha1HmacChallenge { } impl ::protobuf::reflect::ProtobufValue for CryptoRc4Sha1HmacChallenge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4459,10 +4357,7 @@ impl ::protobuf::Message for UpgradeRequiredMessage { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4481,7 +4376,7 @@ impl ::protobuf::Message for UpgradeRequiredMessage { |m: &UpgradeRequiredMessage| { &m.http_suffix }, |m: &mut UpgradeRequiredMessage| { &mut m.http_suffix }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UpgradeRequiredMessage", fields, file_descriptor_proto() @@ -4491,10 +4386,7 @@ impl ::protobuf::Message for UpgradeRequiredMessage { } fn default_instance() -> &'static UpgradeRequiredMessage { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const UpgradeRequiredMessage, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(UpgradeRequiredMessage::new) } @@ -4517,8 +4409,8 @@ impl ::std::fmt::Debug for UpgradeRequiredMessage { } impl ::protobuf::reflect::ProtobufValue for UpgradeRequiredMessage { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4748,10 +4640,7 @@ impl ::protobuf::Message for APLoginFailed { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4775,7 +4664,7 @@ impl ::protobuf::Message for APLoginFailed { |m: &APLoginFailed| { &m.error_description }, |m: &mut APLoginFailed| { &mut m.error_description }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APLoginFailed", fields, file_descriptor_proto() @@ -4785,10 +4674,7 @@ impl ::protobuf::Message for APLoginFailed { } fn default_instance() -> &'static APLoginFailed { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const APLoginFailed, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(APLoginFailed::new) } @@ -4812,8 +4698,8 @@ impl ::std::fmt::Debug for APLoginFailed { } impl ::protobuf::reflect::ProtobufValue for APLoginFailed { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5061,10 +4947,7 @@ impl ::protobuf::Message for ClientResponsePlaintext { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5083,7 +4966,7 @@ impl ::protobuf::Message for ClientResponsePlaintext { |m: &ClientResponsePlaintext| { &m.crypto_response }, |m: &mut ClientResponsePlaintext| { &mut m.crypto_response }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientResponsePlaintext", fields, file_descriptor_proto() @@ -5093,10 +4976,7 @@ impl ::protobuf::Message for ClientResponsePlaintext { } fn default_instance() -> &'static ClientResponsePlaintext { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientResponsePlaintext, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientResponsePlaintext::new) } @@ -5119,8 +4999,8 @@ impl ::std::fmt::Debug for ClientResponsePlaintext { } impl ::protobuf::reflect::ProtobufValue for ClientResponsePlaintext { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5257,10 +5137,7 @@ impl ::protobuf::Message for LoginCryptoResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5269,7 +5146,7 @@ impl ::protobuf::Message for LoginCryptoResponseUnion { |m: &LoginCryptoResponseUnion| { &m.diffie_hellman }, |m: &mut LoginCryptoResponseUnion| { &mut m.diffie_hellman }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoResponseUnion", fields, file_descriptor_proto() @@ -5279,10 +5156,7 @@ impl ::protobuf::Message for LoginCryptoResponseUnion { } fn default_instance() -> &'static LoginCryptoResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCryptoResponseUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCryptoResponseUnion::new) } @@ -5303,8 +5177,8 @@ impl ::std::fmt::Debug for LoginCryptoResponseUnion { } impl ::protobuf::reflect::ProtobufValue for LoginCryptoResponseUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5439,10 +5313,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5451,7 +5322,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse { |m: &LoginCryptoDiffieHellmanResponse| { &m.hmac }, |m: &mut LoginCryptoDiffieHellmanResponse| { &mut m.hmac }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoDiffieHellmanResponse", fields, file_descriptor_proto() @@ -5461,10 +5332,7 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse { } fn default_instance() -> &'static LoginCryptoDiffieHellmanResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const LoginCryptoDiffieHellmanResponse, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(LoginCryptoDiffieHellmanResponse::new) } @@ -5485,8 +5353,8 @@ impl ::std::fmt::Debug for LoginCryptoDiffieHellmanResponse { } impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanResponse { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5623,10 +5491,7 @@ impl ::protobuf::Message for PoWResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5635,7 +5500,7 @@ impl ::protobuf::Message for PoWResponseUnion { |m: &PoWResponseUnion| { &m.hash_cash }, |m: &mut PoWResponseUnion| { &mut m.hash_cash }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWResponseUnion", fields, file_descriptor_proto() @@ -5645,10 +5510,7 @@ impl ::protobuf::Message for PoWResponseUnion { } fn default_instance() -> &'static PoWResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PoWResponseUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PoWResponseUnion::new) } @@ -5669,8 +5531,8 @@ impl ::std::fmt::Debug for PoWResponseUnion { } impl ::protobuf::reflect::ProtobufValue for PoWResponseUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5805,10 +5667,7 @@ impl ::protobuf::Message for PoWHashCashResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5817,7 +5676,7 @@ impl ::protobuf::Message for PoWHashCashResponse { |m: &PoWHashCashResponse| { &m.hash_suffix }, |m: &mut PoWHashCashResponse| { &mut m.hash_suffix }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWHashCashResponse", fields, file_descriptor_proto() @@ -5827,10 +5686,7 @@ impl ::protobuf::Message for PoWHashCashResponse { } fn default_instance() -> &'static PoWHashCashResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const PoWHashCashResponse, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(PoWHashCashResponse::new) } @@ -5851,8 +5707,8 @@ impl ::std::fmt::Debug for PoWHashCashResponse { } impl ::protobuf::reflect::ProtobufValue for PoWHashCashResponse { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6040,10 +5896,7 @@ impl ::protobuf::Message for CryptoResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6057,7 +5910,7 @@ impl ::protobuf::Message for CryptoResponseUnion { |m: &CryptoResponseUnion| { &m.rc4_sha1_hmac }, |m: &mut CryptoResponseUnion| { &mut m.rc4_sha1_hmac }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoResponseUnion", fields, file_descriptor_proto() @@ -6067,10 +5920,7 @@ impl ::protobuf::Message for CryptoResponseUnion { } fn default_instance() -> &'static CryptoResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const CryptoResponseUnion, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(CryptoResponseUnion::new) } @@ -6092,8 +5942,8 @@ impl ::std::fmt::Debug for CryptoResponseUnion { } impl ::protobuf::reflect::ProtobufValue for CryptoResponseUnion { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6212,10 +6062,7 @@ impl ::protobuf::Message for CryptoShannonResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6224,7 +6071,7 @@ impl ::protobuf::Message for CryptoShannonResponse { |m: &CryptoShannonResponse| { &m.dummy }, |m: &mut CryptoShannonResponse| { &mut m.dummy }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoShannonResponse", fields, file_descriptor_proto() @@ -6234,10 +6081,7 @@ impl ::protobuf::Message for CryptoShannonResponse { } fn default_instance() -> &'static CryptoShannonResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const CryptoShannonResponse, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(CryptoShannonResponse::new) } @@ -6258,8 +6102,8 @@ impl ::std::fmt::Debug for CryptoShannonResponse { } impl ::protobuf::reflect::ProtobufValue for CryptoShannonResponse { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6378,10 +6222,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6390,7 +6231,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse { |m: &CryptoRc4Sha1HmacResponse| { &m.dummy }, |m: &mut CryptoRc4Sha1HmacResponse| { &mut m.dummy }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoRc4Sha1HmacResponse", fields, file_descriptor_proto() @@ -6400,10 +6241,7 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse { } fn default_instance() -> &'static CryptoRc4Sha1HmacResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const CryptoRc4Sha1HmacResponse, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(CryptoRc4Sha1HmacResponse::new) } @@ -6424,8 +6262,8 @@ impl ::std::fmt::Debug for CryptoRc4Sha1HmacResponse { } impl ::protobuf::reflect::ProtobufValue for CryptoRc4Sha1HmacResponse { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6466,13 +6304,10 @@ impl ::protobuf::ProtobufEnum for Product { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Product", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Product", file_descriptor_proto()) }) } } @@ -6488,8 +6323,8 @@ impl ::std::default::Default for Product { } impl ::protobuf::reflect::ProtobufValue for Product { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6521,13 +6356,10 @@ impl ::protobuf::ProtobufEnum for ProductFlags { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ProductFlags", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ProductFlags", file_descriptor_proto()) }) } } @@ -6543,8 +6375,8 @@ impl ::std::default::Default for ProductFlags { } impl ::protobuf::reflect::ProtobufValue for ProductFlags { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6642,13 +6474,10 @@ impl ::protobuf::ProtobufEnum for Platform { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Platform", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Platform", file_descriptor_proto()) }) } } @@ -6664,8 +6493,8 @@ impl ::std::default::Default for Platform { } impl ::protobuf::reflect::ProtobufValue for Platform { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6697,13 +6526,10 @@ impl ::protobuf::ProtobufEnum for Fingerprint { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Fingerprint", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Fingerprint", file_descriptor_proto()) }) } } @@ -6719,8 +6545,8 @@ impl ::std::default::Default for Fingerprint { } impl ::protobuf::reflect::ProtobufValue for Fingerprint { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6752,13 +6578,10 @@ impl ::protobuf::ProtobufEnum for Cryptosuite { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Cryptosuite", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Cryptosuite", file_descriptor_proto()) }) } } @@ -6774,8 +6597,8 @@ impl ::std::default::Default for Cryptosuite { } impl ::protobuf::reflect::ProtobufValue for Cryptosuite { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6804,13 +6627,10 @@ impl ::protobuf::ProtobufEnum for Powscheme { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Powscheme", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Powscheme", file_descriptor_proto()) }) } } @@ -6826,8 +6646,8 @@ impl ::std::default::Default for Powscheme { } impl ::protobuf::reflect::ProtobufValue for Powscheme { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6886,13 +6706,10 @@ impl ::protobuf::ProtobufEnum for ErrorCode { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ErrorCode", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ErrorCode", file_descriptor_proto()) }) } } @@ -6908,8 +6725,8 @@ impl ::std::default::Default for ErrorCode { } impl ::protobuf::reflect::ProtobufValue for ErrorCode { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -7007,10 +6824,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/mercury.rs b/protocol/src/mercury.rs index 3b371f7a..ab6f5f9a 100644 --- a/protocol/src/mercury.rs +++ b/protocol/src/mercury.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct MercuryMultiGetRequest { @@ -151,10 +151,7 @@ impl ::protobuf::Message for MercuryMultiGetRequest { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -163,7 +160,7 @@ impl ::protobuf::Message for MercuryMultiGetRequest { |m: &MercuryMultiGetRequest| { &m.request }, |m: &mut MercuryMultiGetRequest| { &mut m.request }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryMultiGetRequest", fields, file_descriptor_proto() @@ -173,10 +170,7 @@ impl ::protobuf::Message for MercuryMultiGetRequest { } fn default_instance() -> &'static MercuryMultiGetRequest { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const MercuryMultiGetRequest, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(MercuryMultiGetRequest::new) } @@ -197,8 +191,8 @@ impl ::std::fmt::Debug for MercuryMultiGetRequest { } impl ::protobuf::reflect::ProtobufValue for MercuryMultiGetRequest { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -327,10 +321,7 @@ impl ::protobuf::Message for MercuryMultiGetReply { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -339,7 +330,7 @@ impl ::protobuf::Message for MercuryMultiGetReply { |m: &MercuryMultiGetReply| { &m.reply }, |m: &mut MercuryMultiGetReply| { &mut m.reply }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryMultiGetReply", fields, file_descriptor_proto() @@ -349,10 +340,7 @@ impl ::protobuf::Message for MercuryMultiGetReply { } fn default_instance() -> &'static MercuryMultiGetReply { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const MercuryMultiGetReply, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(MercuryMultiGetReply::new) } @@ -373,8 +361,8 @@ impl ::std::fmt::Debug for MercuryMultiGetReply { } impl ::protobuf::reflect::ProtobufValue for MercuryMultiGetReply { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -644,10 +632,7 @@ impl ::protobuf::Message for MercuryRequest { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -671,7 +656,7 @@ impl ::protobuf::Message for MercuryRequest { |m: &MercuryRequest| { &m.etag }, |m: &mut MercuryRequest| { &mut m.etag }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryRequest", fields, file_descriptor_proto() @@ -681,10 +666,7 @@ impl ::protobuf::Message for MercuryRequest { } fn default_instance() -> &'static MercuryRequest { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const MercuryRequest, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(MercuryRequest::new) } @@ -708,8 +690,8 @@ impl ::std::fmt::Debug for MercuryRequest { } impl ::protobuf::reflect::ProtobufValue for MercuryRequest { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1074,10 +1056,7 @@ impl ::protobuf::Message for MercuryReply { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1116,7 +1095,7 @@ impl ::protobuf::Message for MercuryReply { |m: &MercuryReply| { &m.body }, |m: &mut MercuryReply| { &mut m.body }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryReply", fields, file_descriptor_proto() @@ -1126,10 +1105,7 @@ impl ::protobuf::Message for MercuryReply { } fn default_instance() -> &'static MercuryReply { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const MercuryReply, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(MercuryReply::new) } @@ -1156,8 +1132,8 @@ impl ::std::fmt::Debug for MercuryReply { } impl ::protobuf::reflect::ProtobufValue for MercuryReply { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1192,13 +1168,10 @@ impl ::protobuf::ProtobufEnum for MercuryReply_CachePolicy { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("MercuryReply_CachePolicy", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("MercuryReply.CachePolicy", file_descriptor_proto()) }) } } @@ -1215,8 +1188,8 @@ impl ::std::default::Default for MercuryReply_CachePolicy { } impl ::protobuf::reflect::ProtobufValue for MercuryReply_CachePolicy { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -1516,10 +1489,7 @@ impl ::protobuf::Message for Header { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1548,7 +1518,7 @@ impl ::protobuf::Message for Header { |m: &Header| { &m.user_fields }, |m: &mut Header| { &mut m.user_fields }, )); - ::protobuf::reflect::MessageDescriptor::new::
( + ::protobuf::reflect::MessageDescriptor::new_pb_name::
( "Header", fields, file_descriptor_proto() @@ -1558,10 +1528,7 @@ impl ::protobuf::Message for Header { } fn default_instance() -> &'static Header { - static mut instance: ::protobuf::lazy::Lazy
= ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Header, - }; + static mut instance: ::protobuf::lazy::Lazy
= ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Header::new) } @@ -1586,8 +1553,8 @@ impl ::std::fmt::Debug for Header { } impl ::protobuf::reflect::ProtobufValue for Header { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1765,10 +1732,7 @@ impl ::protobuf::Message for UserField { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1782,7 +1746,7 @@ impl ::protobuf::Message for UserField { |m: &UserField| { &m.value }, |m: &mut UserField| { &mut m.value }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UserField", fields, file_descriptor_proto() @@ -1792,10 +1756,7 @@ impl ::protobuf::Message for UserField { } fn default_instance() -> &'static UserField { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const UserField, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(UserField::new) } @@ -1817,8 +1778,8 @@ impl ::std::fmt::Debug for UserField { } impl ::protobuf::reflect::ProtobufValue for UserField { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1843,10 +1804,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x0f\n\x05value\x18\x02\x20\x01(\x0cB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/metadata.rs b/protocol/src/metadata.rs index 571cd7d2..99635e70 100644 --- a/protocol/src/metadata.rs +++ b/protocol/src/metadata.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct TopTracks { @@ -197,10 +197,7 @@ impl ::protobuf::Message for TopTracks { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -214,7 +211,7 @@ impl ::protobuf::Message for TopTracks { |m: &TopTracks| { &m.track }, |m: &mut TopTracks| { &mut m.track }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "TopTracks", fields, file_descriptor_proto() @@ -224,10 +221,7 @@ impl ::protobuf::Message for TopTracks { } fn default_instance() -> &'static TopTracks { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const TopTracks, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(TopTracks::new) } @@ -249,8 +243,8 @@ impl ::std::fmt::Debug for TopTracks { } impl ::protobuf::reflect::ProtobufValue for TopTracks { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -435,10 +429,7 @@ impl ::protobuf::Message for ActivityPeriod { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -457,7 +448,7 @@ impl ::protobuf::Message for ActivityPeriod { |m: &ActivityPeriod| { &m.decade }, |m: &mut ActivityPeriod| { &mut m.decade }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ActivityPeriod", fields, file_descriptor_proto() @@ -467,10 +458,7 @@ impl ::protobuf::Message for ActivityPeriod { } fn default_instance() -> &'static ActivityPeriod { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ActivityPeriod, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ActivityPeriod::new) } @@ -493,8 +481,8 @@ impl ::std::fmt::Debug for ActivityPeriod { } impl ::protobuf::reflect::ProtobufValue for ActivityPeriod { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1297,10 +1285,7 @@ impl ::protobuf::Message for Artist { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1389,7 +1374,7 @@ impl ::protobuf::Message for Artist { |m: &Artist| { &m.portrait_group }, |m: &mut Artist| { &mut m.portrait_group }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Artist", fields, file_descriptor_proto() @@ -1399,10 +1384,7 @@ impl ::protobuf::Message for Artist { } fn default_instance() -> &'static Artist { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Artist, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Artist::new) } @@ -1439,8 +1421,8 @@ impl ::std::fmt::Debug for Artist { } impl ::protobuf::reflect::ProtobufValue for Artist { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1569,10 +1551,7 @@ impl ::protobuf::Message for AlbumGroup { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1581,7 +1560,7 @@ impl ::protobuf::Message for AlbumGroup { |m: &AlbumGroup| { &m.album }, |m: &mut AlbumGroup| { &mut m.album }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AlbumGroup", fields, file_descriptor_proto() @@ -1591,10 +1570,7 @@ impl ::protobuf::Message for AlbumGroup { } fn default_instance() -> &'static AlbumGroup { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const AlbumGroup, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(AlbumGroup::new) } @@ -1615,8 +1591,8 @@ impl ::std::fmt::Debug for AlbumGroup { } impl ::protobuf::reflect::ProtobufValue for AlbumGroup { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1867,10 +1843,7 @@ impl ::protobuf::Message for Date { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1899,7 +1872,7 @@ impl ::protobuf::Message for Date { |m: &Date| { &m.minute }, |m: &mut Date| { &mut m.minute }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Date", fields, file_descriptor_proto() @@ -1909,10 +1882,7 @@ impl ::protobuf::Message for Date { } fn default_instance() -> &'static Date { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Date, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Date::new) } @@ -1937,8 +1907,8 @@ impl ::std::fmt::Debug for Date { } impl ::protobuf::reflect::ProtobufValue for Date { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2740,10 +2710,7 @@ impl ::protobuf::Message for Album { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2832,7 +2799,7 @@ impl ::protobuf::Message for Album { |m: &Album| { &m.cover_group }, |m: &mut Album| { &mut m.cover_group }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Album", fields, file_descriptor_proto() @@ -2842,10 +2809,7 @@ impl ::protobuf::Message for Album { } fn default_instance() -> &'static Album { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Album, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Album::new) } @@ -2882,8 +2846,8 @@ impl ::std::fmt::Debug for Album { } impl ::protobuf::reflect::ProtobufValue for Album { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2921,13 +2885,10 @@ impl ::protobuf::ProtobufEnum for Album_Type { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Album_Type", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Album.Type", file_descriptor_proto()) }) } } @@ -2944,8 +2905,8 @@ impl ::std::default::Default for Album_Type { } impl ::protobuf::reflect::ProtobufValue for Album_Type { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -3640,10 +3601,7 @@ impl ::protobuf::Message for Track { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3722,7 +3680,7 @@ impl ::protobuf::Message for Track { |m: &Track| { &m.preview }, |m: &mut Track| { &mut m.preview }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Track", fields, file_descriptor_proto() @@ -3732,10 +3690,7 @@ impl ::protobuf::Message for Track { } fn default_instance() -> &'static Track { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Track, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Track::new) } @@ -3770,8 +3725,8 @@ impl ::std::fmt::Debug for Track { } impl ::protobuf::reflect::ProtobufValue for Track { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3998,10 +3953,7 @@ impl ::protobuf::Message for Image { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4025,7 +3977,7 @@ impl ::protobuf::Message for Image { |m: &Image| { &m.height }, |m: &mut Image| { &mut m.height }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Image", fields, file_descriptor_proto() @@ -4035,10 +3987,7 @@ impl ::protobuf::Message for Image { } fn default_instance() -> &'static Image { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Image, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Image::new) } @@ -4062,8 +4011,8 @@ impl ::std::fmt::Debug for Image { } impl ::protobuf::reflect::ProtobufValue for Image { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4101,13 +4050,10 @@ impl ::protobuf::ProtobufEnum for Image_Size { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Image_Size", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Image.Size", file_descriptor_proto()) }) } } @@ -4123,8 +4069,8 @@ impl ::std::default::Default for Image_Size { } impl ::protobuf::reflect::ProtobufValue for Image_Size { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -4253,10 +4199,7 @@ impl ::protobuf::Message for ImageGroup { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4265,7 +4208,7 @@ impl ::protobuf::Message for ImageGroup { |m: &ImageGroup| { &m.image }, |m: &mut ImageGroup| { &mut m.image }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ImageGroup", fields, file_descriptor_proto() @@ -4275,10 +4218,7 @@ impl ::protobuf::Message for ImageGroup { } fn default_instance() -> &'static ImageGroup { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ImageGroup, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ImageGroup::new) } @@ -4299,8 +4239,8 @@ impl ::std::fmt::Debug for ImageGroup { } impl ::protobuf::reflect::ProtobufValue for ImageGroup { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4518,10 +4458,7 @@ impl ::protobuf::Message for Biography { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4540,7 +4477,7 @@ impl ::protobuf::Message for Biography { |m: &Biography| { &m.portrait_group }, |m: &mut Biography| { &mut m.portrait_group }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Biography", fields, file_descriptor_proto() @@ -4550,10 +4487,7 @@ impl ::protobuf::Message for Biography { } fn default_instance() -> &'static Biography { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Biography, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Biography::new) } @@ -4576,8 +4510,8 @@ impl ::std::fmt::Debug for Biography { } impl ::protobuf::reflect::ProtobufValue for Biography { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -4785,10 +4719,7 @@ impl ::protobuf::Message for Disc { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -4807,7 +4738,7 @@ impl ::protobuf::Message for Disc { |m: &Disc| { &m.track }, |m: &mut Disc| { &mut m.track }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Disc", fields, file_descriptor_proto() @@ -4817,10 +4748,7 @@ impl ::protobuf::Message for Disc { } fn default_instance() -> &'static Disc { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Disc, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Disc::new) } @@ -4843,8 +4771,8 @@ impl ::std::fmt::Debug for Disc { } impl ::protobuf::reflect::ProtobufValue for Disc { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5005,10 +4933,7 @@ impl ::protobuf::Message for Copyright { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5022,7 +4947,7 @@ impl ::protobuf::Message for Copyright { |m: &Copyright| { &m.text }, |m: &mut Copyright| { &mut m.text }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Copyright", fields, file_descriptor_proto() @@ -5032,10 +4957,7 @@ impl ::protobuf::Message for Copyright { } fn default_instance() -> &'static Copyright { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Copyright, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Copyright::new) } @@ -5057,8 +4979,8 @@ impl ::std::fmt::Debug for Copyright { } impl ::protobuf::reflect::ProtobufValue for Copyright { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5090,13 +5012,10 @@ impl ::protobuf::ProtobufEnum for Copyright_Type { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Copyright_Type", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Copyright.Type", file_descriptor_proto()) }) } } @@ -5112,8 +5031,8 @@ impl ::std::default::Default for Copyright_Type { } impl ::protobuf::reflect::ProtobufValue for Copyright_Type { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -5390,10 +5309,7 @@ impl ::protobuf::Message for Restriction { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5422,7 +5338,7 @@ impl ::protobuf::Message for Restriction { |m: &Restriction| { &m.catalogue_str }, |m: &mut Restriction| { &mut m.catalogue_str }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Restriction", fields, file_descriptor_proto() @@ -5432,10 +5348,7 @@ impl ::protobuf::Message for Restriction { } fn default_instance() -> &'static Restriction { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Restriction, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Restriction::new) } @@ -5460,8 +5373,8 @@ impl ::std::fmt::Debug for Restriction { } impl ::protobuf::reflect::ProtobufValue for Restriction { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -5502,13 +5415,10 @@ impl ::protobuf::ProtobufEnum for Restriction_Catalogue { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Restriction_Catalogue", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Restriction.Catalogue", file_descriptor_proto()) }) } } @@ -5524,8 +5434,8 @@ impl ::std::default::Default for Restriction_Catalogue { } impl ::protobuf::reflect::ProtobufValue for Restriction_Catalogue { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -5554,13 +5464,10 @@ impl ::protobuf::ProtobufEnum for Restriction_Type { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Restriction_Type", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Restriction.Type", file_descriptor_proto()) }) } } @@ -5576,8 +5483,8 @@ impl ::std::default::Default for Restriction_Type { } impl ::protobuf::reflect::ProtobufValue for Restriction_Type { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -5749,10 +5656,7 @@ impl ::protobuf::Message for Availability { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -5766,7 +5670,7 @@ impl ::protobuf::Message for Availability { |m: &Availability| { &m.start }, |m: &mut Availability| { &mut m.start }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Availability", fields, file_descriptor_proto() @@ -5776,10 +5680,7 @@ impl ::protobuf::Message for Availability { } fn default_instance() -> &'static Availability { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Availability, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Availability::new) } @@ -5801,8 +5702,8 @@ impl ::std::fmt::Debug for Availability { } impl ::protobuf::reflect::ProtobufValue for Availability { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6033,10 +5934,7 @@ impl ::protobuf::Message for SalePeriod { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6055,7 +5953,7 @@ impl ::protobuf::Message for SalePeriod { |m: &SalePeriod| { &m.end }, |m: &mut SalePeriod| { &mut m.end }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "SalePeriod", fields, file_descriptor_proto() @@ -6065,10 +5963,7 @@ impl ::protobuf::Message for SalePeriod { } fn default_instance() -> &'static SalePeriod { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const SalePeriod, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(SalePeriod::new) } @@ -6091,8 +5986,8 @@ impl ::std::fmt::Debug for SalePeriod { } impl ::protobuf::reflect::ProtobufValue for SalePeriod { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6270,10 +6165,7 @@ impl ::protobuf::Message for ExternalId { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6287,7 +6179,7 @@ impl ::protobuf::Message for ExternalId { |m: &ExternalId| { &m.id }, |m: &mut ExternalId| { &mut m.id }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ExternalId", fields, file_descriptor_proto() @@ -6297,10 +6189,7 @@ impl ::protobuf::Message for ExternalId { } fn default_instance() -> &'static ExternalId { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ExternalId, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ExternalId::new) } @@ -6322,8 +6211,8 @@ impl ::std::fmt::Debug for ExternalId { } impl ::protobuf::reflect::ProtobufValue for ExternalId { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6484,10 +6373,7 @@ impl ::protobuf::Message for AudioFile { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6501,7 +6387,7 @@ impl ::protobuf::Message for AudioFile { |m: &AudioFile| { &m.format }, |m: &mut AudioFile| { &mut m.format }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AudioFile", fields, file_descriptor_proto() @@ -6511,10 +6397,7 @@ impl ::protobuf::Message for AudioFile { } fn default_instance() -> &'static AudioFile { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const AudioFile, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(AudioFile::new) } @@ -6536,8 +6419,8 @@ impl ::std::fmt::Debug for AudioFile { } impl ::protobuf::reflect::ProtobufValue for AudioFile { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -6605,13 +6488,10 @@ impl ::protobuf::ProtobufEnum for AudioFile_Format { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("AudioFile_Format", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("AudioFile.Format", file_descriptor_proto()) }) } } @@ -6627,8 +6507,8 @@ impl ::std::default::Default for AudioFile_Format { } impl ::protobuf::reflect::ProtobufValue for AudioFile_Format { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -6760,10 +6640,7 @@ impl ::protobuf::Message for VideoFile { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -6772,7 +6649,7 @@ impl ::protobuf::Message for VideoFile { |m: &VideoFile| { &m.file_id }, |m: &mut VideoFile| { &mut m.file_id }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "VideoFile", fields, file_descriptor_proto() @@ -6782,10 +6659,7 @@ impl ::protobuf::Message for VideoFile { } fn default_instance() -> &'static VideoFile { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const VideoFile, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(VideoFile::new) } @@ -6806,8 +6680,8 @@ impl ::std::fmt::Debug for VideoFile { } impl ::protobuf::reflect::ProtobufValue for VideoFile { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -7656,10 +7530,7 @@ impl ::protobuf::Message for Show { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -7758,7 +7629,7 @@ impl ::protobuf::Message for Show { |m: &Show| { &m.passthrough }, |m: &mut Show| { &mut m.passthrough }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Show", fields, file_descriptor_proto() @@ -7768,10 +7639,7 @@ impl ::protobuf::Message for Show { } fn default_instance() -> &'static Show { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Show, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Show::new) } @@ -7810,8 +7678,8 @@ impl ::std::fmt::Debug for Show { } impl ::protobuf::reflect::ProtobufValue for Show { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -7846,13 +7714,10 @@ impl ::protobuf::ProtobufEnum for Show_MediaType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Show_MediaType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Show.MediaType", file_descriptor_proto()) }) } } @@ -7868,8 +7733,8 @@ impl ::std::default::Default for Show_MediaType { } impl ::protobuf::reflect::ProtobufValue for Show_MediaType { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -7904,13 +7769,10 @@ impl ::protobuf::ProtobufEnum for Show_ConsumptionOrder { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Show_ConsumptionOrder", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Show.ConsumptionOrder", file_descriptor_proto()) }) } } @@ -7927,8 +7789,8 @@ impl ::std::default::Default for Show_ConsumptionOrder { } impl ::protobuf::reflect::ProtobufValue for Show_ConsumptionOrder { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -7963,13 +7825,10 @@ impl ::protobuf::ProtobufEnum for Show_PassthroughEnum { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Show_PassthroughEnum", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Show.PassthroughEnum", file_descriptor_proto()) }) } } @@ -7985,8 +7844,8 @@ impl ::std::default::Default for Show_PassthroughEnum { } impl ::protobuf::reflect::ProtobufValue for Show_PassthroughEnum { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -9114,10 +8973,7 @@ impl ::protobuf::Message for Episode { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -9246,7 +9102,7 @@ impl ::protobuf::Message for Episode { |m: &Episode| { &m.original_audio }, |m: &mut Episode| { &mut m.original_audio }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Episode", fields, file_descriptor_proto() @@ -9256,10 +9112,7 @@ impl ::protobuf::Message for Episode { } fn default_instance() -> &'static Episode { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Episode, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Episode::new) } @@ -9304,8 +9157,8 @@ impl ::std::fmt::Debug for Episode { } impl ::protobuf::reflect::ProtobufValue for Episode { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -9480,10 +9333,7 @@ impl ::protobuf::Message for Category { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -9497,7 +9347,7 @@ impl ::protobuf::Message for Category { |m: &Category| { &m.subcategories }, |m: &mut Category| { &mut m.subcategories }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Category", fields, file_descriptor_proto() @@ -9507,10 +9357,7 @@ impl ::protobuf::Message for Category { } fn default_instance() -> &'static Category { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Category, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Category::new) } @@ -9532,8 +9379,8 @@ impl ::std::fmt::Debug for Category { } impl ::protobuf::reflect::ProtobufValue for Category { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -9665,10 +9512,7 @@ impl ::protobuf::Message for OriginalAudio { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -9677,7 +9521,7 @@ impl ::protobuf::Message for OriginalAudio { |m: &OriginalAudio| { &m.uuid }, |m: &mut OriginalAudio| { &mut m.uuid }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "OriginalAudio", fields, file_descriptor_proto() @@ -9687,10 +9531,7 @@ impl ::protobuf::Message for OriginalAudio { } fn default_instance() -> &'static OriginalAudio { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const OriginalAudio, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(OriginalAudio::new) } @@ -9711,8 +9552,8 @@ impl ::std::fmt::Debug for OriginalAudio { } impl ::protobuf::reflect::ProtobufValue for OriginalAudio { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -9843,10 +9684,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x01\x20\x01(\x0cB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/playlist4changes.rs b/protocol/src/playlist4changes.rs index 3fefbdd1..7022f152 100644 --- a/protocol/src/playlist4changes.rs +++ b/protocol/src/playlist4changes.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct ChangeInfo { @@ -385,10 +385,7 @@ impl ::protobuf::Message for ChangeInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -432,7 +429,7 @@ impl ::protobuf::Message for ChangeInfo { |m: &ChangeInfo| { &m.migration }, |m: &mut ChangeInfo| { &mut m.migration }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ChangeInfo", fields, file_descriptor_proto() @@ -442,10 +439,7 @@ impl ::protobuf::Message for ChangeInfo { } fn default_instance() -> &'static ChangeInfo { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ChangeInfo, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ChangeInfo::new) } @@ -473,8 +467,8 @@ impl ::std::fmt::Debug for ChangeInfo { } impl ::protobuf::reflect::ProtobufValue for ChangeInfo { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -700,10 +694,7 @@ impl ::protobuf::Message for Delta { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -722,7 +713,7 @@ impl ::protobuf::Message for Delta { |m: &Delta| { &m.info }, |m: &mut Delta| { &mut m.info }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Delta", fields, file_descriptor_proto() @@ -732,10 +723,7 @@ impl ::protobuf::Message for Delta { } fn default_instance() -> &'static Delta { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Delta, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Delta::new) } @@ -758,8 +746,8 @@ impl ::std::fmt::Debug for Delta { } impl ::protobuf::reflect::ProtobufValue for Delta { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -988,10 +976,7 @@ impl ::protobuf::Message for Merge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1010,7 +995,7 @@ impl ::protobuf::Message for Merge { |m: &Merge| { &m.info }, |m: &mut Merge| { &mut m.info }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Merge", fields, file_descriptor_proto() @@ -1020,10 +1005,7 @@ impl ::protobuf::Message for Merge { } fn default_instance() -> &'static Merge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Merge, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Merge::new) } @@ -1046,8 +1028,8 @@ impl ::std::fmt::Debug for Merge { } impl ::protobuf::reflect::ProtobufValue for Merge { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1264,10 +1246,7 @@ impl ::protobuf::Message for ChangeSet { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1286,7 +1265,7 @@ impl ::protobuf::Message for ChangeSet { |m: &ChangeSet| { &m.merge }, |m: &mut ChangeSet| { &mut m.merge }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ChangeSet", fields, file_descriptor_proto() @@ -1296,10 +1275,7 @@ impl ::protobuf::Message for ChangeSet { } fn default_instance() -> &'static ChangeSet { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ChangeSet, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ChangeSet::new) } @@ -1322,8 +1298,8 @@ impl ::std::fmt::Debug for ChangeSet { } impl ::protobuf::reflect::ProtobufValue for ChangeSet { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1358,13 +1334,10 @@ impl ::protobuf::ProtobufEnum for ChangeSet_Kind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ChangeSet_Kind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ChangeSet.Kind", file_descriptor_proto()) }) } } @@ -1380,8 +1353,8 @@ impl ::std::default::Default for ChangeSet_Kind { } impl ::protobuf::reflect::ProtobufValue for ChangeSet_Kind { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -1564,10 +1537,7 @@ impl ::protobuf::Message for RevisionTaggedChangeSet { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1581,7 +1551,7 @@ impl ::protobuf::Message for RevisionTaggedChangeSet { |m: &RevisionTaggedChangeSet| { &m.change_set }, |m: &mut RevisionTaggedChangeSet| { &mut m.change_set }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "RevisionTaggedChangeSet", fields, file_descriptor_proto() @@ -1591,10 +1561,7 @@ impl ::protobuf::Message for RevisionTaggedChangeSet { } fn default_instance() -> &'static RevisionTaggedChangeSet { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const RevisionTaggedChangeSet, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(RevisionTaggedChangeSet::new) } @@ -1616,8 +1583,8 @@ impl ::std::fmt::Debug for RevisionTaggedChangeSet { } impl ::protobuf::reflect::ProtobufValue for RevisionTaggedChangeSet { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1838,10 +1805,7 @@ impl ::protobuf::Message for Diff { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1860,7 +1824,7 @@ impl ::protobuf::Message for Diff { |m: &Diff| { &m.to_revision }, |m: &mut Diff| { &mut m.to_revision }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Diff", fields, file_descriptor_proto() @@ -1870,10 +1834,7 @@ impl ::protobuf::Message for Diff { } fn default_instance() -> &'static Diff { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Diff, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Diff::new) } @@ -1896,8 +1857,8 @@ impl ::std::fmt::Debug for Diff { } impl ::protobuf::reflect::ProtobufValue for Diff { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2258,10 +2219,7 @@ impl ::protobuf::Message for ListDump { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2295,7 +2253,7 @@ impl ::protobuf::Message for ListDump { |m: &ListDump| { &m.pendingDeltas }, |m: &mut ListDump| { &mut m.pendingDeltas }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListDump", fields, file_descriptor_proto() @@ -2305,10 +2263,7 @@ impl ::protobuf::Message for ListDump { } fn default_instance() -> &'static ListDump { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListDump, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListDump::new) } @@ -2334,8 +2289,8 @@ impl ::std::fmt::Debug for ListDump { } impl ::protobuf::reflect::ProtobufValue for ListDump { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2662,10 +2617,7 @@ impl ::protobuf::Message for ListChanges { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2699,7 +2651,7 @@ impl ::protobuf::Message for ListChanges { |m: &ListChanges| { &m.nonces }, |m: &mut ListChanges| { &mut m.nonces }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListChanges", fields, file_descriptor_proto() @@ -2709,10 +2661,7 @@ impl ::protobuf::Message for ListChanges { } fn default_instance() -> &'static ListChanges { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListChanges, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListChanges::new) } @@ -2738,8 +2687,8 @@ impl ::std::fmt::Debug for ListChanges { } impl ::protobuf::reflect::ProtobufValue for ListChanges { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3427,10 +3376,7 @@ impl ::protobuf::Message for SelectedListContent { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3504,7 +3450,7 @@ impl ::protobuf::Message for SelectedListContent { |m: &SelectedListContent| { &m.owner_username }, |m: &mut SelectedListContent| { &mut m.owner_username }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "SelectedListContent", fields, file_descriptor_proto() @@ -3514,10 +3460,7 @@ impl ::protobuf::Message for SelectedListContent { } fn default_instance() -> &'static SelectedListContent { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const SelectedListContent, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(SelectedListContent::new) } @@ -3551,8 +3494,8 @@ impl ::std::fmt::Debug for SelectedListContent { } impl ::protobuf::reflect::ProtobufValue for SelectedListContent { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3600,10 +3543,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x20\x01(\tB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/playlist4content.rs b/protocol/src/playlist4content.rs index c92f6870..58b5bea3 100644 --- a/protocol/src/playlist4content.rs +++ b/protocol/src/playlist4content.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct Item { @@ -205,10 +205,7 @@ impl ::protobuf::Message for Item { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -222,7 +219,7 @@ impl ::protobuf::Message for Item { |m: &Item| { &m.attributes }, |m: &mut Item| { &mut m.attributes }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Item", fields, file_descriptor_proto() @@ -232,10 +229,7 @@ impl ::protobuf::Message for Item { } fn default_instance() -> &'static Item { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Item, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Item::new) } @@ -257,8 +251,8 @@ impl ::std::fmt::Debug for Item { } impl ::protobuf::reflect::ProtobufValue for Item { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -453,10 +447,7 @@ impl ::protobuf::Message for ListItems { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -475,7 +466,7 @@ impl ::protobuf::Message for ListItems { |m: &ListItems| { &m.items }, |m: &mut ListItems| { &mut m.items }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListItems", fields, file_descriptor_proto() @@ -485,10 +476,7 @@ impl ::protobuf::Message for ListItems { } fn default_instance() -> &'static ListItems { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListItems, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListItems::new) } @@ -511,8 +499,8 @@ impl ::std::fmt::Debug for ListItems { } impl ::protobuf::reflect::ProtobufValue for ListItems { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -664,10 +652,7 @@ impl ::protobuf::Message for ContentRange { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -681,7 +666,7 @@ impl ::protobuf::Message for ContentRange { |m: &ContentRange| { &m.length }, |m: &mut ContentRange| { &mut m.length }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ContentRange", fields, file_descriptor_proto() @@ -691,10 +676,7 @@ impl ::protobuf::Message for ContentRange { } fn default_instance() -> &'static ContentRange { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ContentRange, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ContentRange::new) } @@ -716,8 +698,8 @@ impl ::std::fmt::Debug for ContentRange { } impl ::protobuf::reflect::ProtobufValue for ContentRange { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1296,10 +1278,7 @@ impl ::protobuf::Message for ListContentSelection { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1368,7 +1347,7 @@ impl ::protobuf::Message for ListContentSelection { |m: &ListContentSelection| { &m.resolveAction }, |m: &mut ListContentSelection| { &mut m.resolveAction }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListContentSelection", fields, file_descriptor_proto() @@ -1378,10 +1357,7 @@ impl ::protobuf::Message for ListContentSelection { } fn default_instance() -> &'static ListContentSelection { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListContentSelection, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListContentSelection::new) } @@ -1414,8 +1390,8 @@ impl ::std::fmt::Debug for ListContentSelection { } impl ::protobuf::reflect::ProtobufValue for ListContentSelection { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1439,10 +1415,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ ionB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/playlist4issues.rs b/protocol/src/playlist4issues.rs index 54aa1627..3448f5c5 100644 --- a/protocol/src/playlist4issues.rs +++ b/protocol/src/playlist4issues.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct ClientIssue { @@ -199,10 +199,7 @@ impl ::protobuf::Message for ClientIssue { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -221,7 +218,7 @@ impl ::protobuf::Message for ClientIssue { |m: &ClientIssue| { &m.repeatCount }, |m: &mut ClientIssue| { &mut m.repeatCount }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientIssue", fields, file_descriptor_proto() @@ -231,10 +228,7 @@ impl ::protobuf::Message for ClientIssue { } fn default_instance() -> &'static ClientIssue { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientIssue, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientIssue::new) } @@ -257,8 +251,8 @@ impl ::std::fmt::Debug for ClientIssue { } impl ::protobuf::reflect::ProtobufValue for ClientIssue { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -302,13 +296,10 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Level { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ClientIssue_Level", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientIssue.Level", file_descriptor_proto()) }) } } @@ -324,8 +315,8 @@ impl ::std::default::Default for ClientIssue_Level { } impl ::protobuf::reflect::ProtobufValue for ClientIssue_Level { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -369,13 +360,10 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Code { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ClientIssue_Code", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientIssue.Code", file_descriptor_proto()) }) } } @@ -391,8 +379,8 @@ impl ::std::default::Default for ClientIssue_Code { } impl ::protobuf::reflect::ProtobufValue for ClientIssue_Code { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -536,10 +524,7 @@ impl ::protobuf::Message for ClientResolveAction { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -553,7 +538,7 @@ impl ::protobuf::Message for ClientResolveAction { |m: &ClientResolveAction| { &m.initiator }, |m: &mut ClientResolveAction| { &mut m.initiator }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientResolveAction", fields, file_descriptor_proto() @@ -563,10 +548,7 @@ impl ::protobuf::Message for ClientResolveAction { } fn default_instance() -> &'static ClientResolveAction { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ClientResolveAction, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ClientResolveAction::new) } @@ -588,8 +570,8 @@ impl ::std::fmt::Debug for ClientResolveAction { } impl ::protobuf::reflect::ProtobufValue for ClientResolveAction { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -636,13 +618,10 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Code { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ClientResolveAction_Code", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientResolveAction.Code", file_descriptor_proto()) }) } } @@ -658,8 +637,8 @@ impl ::std::default::Default for ClientResolveAction_Code { } impl ::protobuf::reflect::ProtobufValue for ClientResolveAction_Code { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -694,13 +673,10 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Initiator { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ClientResolveAction_Initiator", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientResolveAction.Initiator", file_descriptor_proto()) }) } } @@ -716,8 +692,8 @@ impl ::std::default::Default for ClientResolveAction_Initiator { } impl ::protobuf::reflect::ProtobufValue for ClientResolveAction_Initiator { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -743,10 +719,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x10\x01\x12\x14\n\x10INITIATOR_CLIENT\x10\x02\x1a\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/playlist4meta.rs b/protocol/src/playlist4meta.rs index 145105e7..f3a0b661 100644 --- a/protocol/src/playlist4meta.rs +++ b/protocol/src/playlist4meta.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct ListChecksum { @@ -187,10 +187,7 @@ impl ::protobuf::Message for ListChecksum { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -204,7 +201,7 @@ impl ::protobuf::Message for ListChecksum { |m: &ListChecksum| { &m.sha1 }, |m: &mut ListChecksum| { &mut m.sha1 }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListChecksum", fields, file_descriptor_proto() @@ -214,10 +211,7 @@ impl ::protobuf::Message for ListChecksum { } fn default_instance() -> &'static ListChecksum { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListChecksum, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListChecksum::new) } @@ -239,8 +233,8 @@ impl ::std::fmt::Debug for ListChecksum { } impl ::protobuf::reflect::ProtobufValue for ListChecksum { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -355,10 +349,7 @@ impl ::protobuf::Message for DownloadFormat { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -367,7 +358,7 @@ impl ::protobuf::Message for DownloadFormat { |m: &DownloadFormat| { &m.codec }, |m: &mut DownloadFormat| { &mut m.codec }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "DownloadFormat", fields, file_descriptor_proto() @@ -377,10 +368,7 @@ impl ::protobuf::Message for DownloadFormat { } fn default_instance() -> &'static DownloadFormat { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const DownloadFormat, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(DownloadFormat::new) } @@ -401,8 +389,8 @@ impl ::std::fmt::Debug for DownloadFormat { } impl ::protobuf::reflect::ProtobufValue for DownloadFormat { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -440,13 +428,10 @@ impl ::protobuf::ProtobufEnum for DownloadFormat_Codec { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("DownloadFormat_Codec", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("DownloadFormat.Codec", file_descriptor_proto()) }) } } @@ -462,8 +447,8 @@ impl ::std::default::Default for DownloadFormat_Codec { } impl ::protobuf::reflect::ProtobufValue for DownloadFormat_Codec { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -944,10 +929,7 @@ impl ::protobuf::Message for ListAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1001,7 +983,7 @@ impl ::protobuf::Message for ListAttributes { |m: &ListAttributes| { &m.client_id }, |m: &mut ListAttributes| { &mut m.client_id }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListAttributes", fields, file_descriptor_proto() @@ -1011,10 +993,7 @@ impl ::protobuf::Message for ListAttributes { } fn default_instance() -> &'static ListAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListAttributes, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListAttributes::new) } @@ -1044,8 +1023,8 @@ impl ::std::fmt::Debug for ListAttributes { } impl ::protobuf::reflect::ProtobufValue for ListAttributes { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1518,10 +1497,7 @@ impl ::protobuf::Message for ItemAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1575,7 +1551,7 @@ impl ::protobuf::Message for ItemAttributes { |m: &ItemAttributes| { &m.public }, |m: &mut ItemAttributes| { &mut m.public }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ItemAttributes", fields, file_descriptor_proto() @@ -1585,10 +1561,7 @@ impl ::protobuf::Message for ItemAttributes { } fn default_instance() -> &'static ItemAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ItemAttributes, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ItemAttributes::new) } @@ -1618,8 +1591,8 @@ impl ::std::fmt::Debug for ItemAttributes { } impl ::protobuf::reflect::ProtobufValue for ItemAttributes { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1797,10 +1770,7 @@ impl ::protobuf::Message for StringAttribute { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1814,7 +1784,7 @@ impl ::protobuf::Message for StringAttribute { |m: &StringAttribute| { &m.value }, |m: &mut StringAttribute| { &mut m.value }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "StringAttribute", fields, file_descriptor_proto() @@ -1824,10 +1794,7 @@ impl ::protobuf::Message for StringAttribute { } fn default_instance() -> &'static StringAttribute { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const StringAttribute, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(StringAttribute::new) } @@ -1849,8 +1816,8 @@ impl ::std::fmt::Debug for StringAttribute { } impl ::protobuf::reflect::ProtobufValue for StringAttribute { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1979,10 +1946,7 @@ impl ::protobuf::Message for StringAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1991,7 +1955,7 @@ impl ::protobuf::Message for StringAttributes { |m: &StringAttributes| { &m.attribute }, |m: &mut StringAttributes| { &mut m.attribute }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "StringAttributes", fields, file_descriptor_proto() @@ -2001,10 +1965,7 @@ impl ::protobuf::Message for StringAttributes { } fn default_instance() -> &'static StringAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const StringAttributes, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(StringAttributes::new) } @@ -2025,8 +1986,8 @@ impl ::std::fmt::Debug for StringAttributes { } impl ::protobuf::reflect::ProtobufValue for StringAttributes { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2056,10 +2017,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ tribute\x18\x01\x20\x03(\x0b2\x10.StringAttributeB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/playlist4ops.rs b/protocol/src/playlist4ops.rs index db92f760..b16fe5d3 100644 --- a/protocol/src/playlist4ops.rs +++ b/protocol/src/playlist4ops.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct Add { @@ -301,10 +301,7 @@ impl ::protobuf::Message for Add { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -333,7 +330,7 @@ impl ::protobuf::Message for Add { |m: &Add| { &m.addFirst }, |m: &mut Add| { &mut m.addFirst }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Add", fields, file_descriptor_proto() @@ -343,10 +340,7 @@ impl ::protobuf::Message for Add { } fn default_instance() -> &'static Add { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Add, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Add::new) } @@ -371,8 +365,8 @@ impl ::std::fmt::Debug for Add { } impl ::protobuf::reflect::ProtobufValue for Add { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -753,10 +747,7 @@ impl ::protobuf::Message for Rem { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -795,7 +786,7 @@ impl ::protobuf::Message for Rem { |m: &Rem| { &m.itemsAsKey }, |m: &mut Rem| { &mut m.itemsAsKey }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Rem", fields, file_descriptor_proto() @@ -805,10 +796,7 @@ impl ::protobuf::Message for Rem { } fn default_instance() -> &'static Rem { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Rem, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Rem::new) } @@ -835,8 +823,8 @@ impl ::std::fmt::Debug for Rem { } impl ::protobuf::reflect::ProtobufValue for Rem { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1174,10 +1162,7 @@ impl ::protobuf::Message for Mov { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1211,7 +1196,7 @@ impl ::protobuf::Message for Mov { |m: &Mov| { &m.uris_checksum }, |m: &mut Mov| { &mut m.uris_checksum }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Mov", fields, file_descriptor_proto() @@ -1221,10 +1206,7 @@ impl ::protobuf::Message for Mov { } fn default_instance() -> &'static Mov { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Mov, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Mov::new) } @@ -1250,8 +1232,8 @@ impl ::std::fmt::Debug for Mov { } impl ::protobuf::reflect::ProtobufValue for Mov { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1423,10 +1405,7 @@ impl ::protobuf::Message for ItemAttributesPartialState { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1440,7 +1419,7 @@ impl ::protobuf::Message for ItemAttributesPartialState { |m: &ItemAttributesPartialState| { &m.no_value }, |m: &mut ItemAttributesPartialState| { &mut m.no_value }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ItemAttributesPartialState", fields, file_descriptor_proto() @@ -1450,10 +1429,7 @@ impl ::protobuf::Message for ItemAttributesPartialState { } fn default_instance() -> &'static ItemAttributesPartialState { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ItemAttributesPartialState, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ItemAttributesPartialState::new) } @@ -1475,8 +1451,8 @@ impl ::std::fmt::Debug for ItemAttributesPartialState { } impl ::protobuf::reflect::ProtobufValue for ItemAttributesPartialState { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1535,13 +1511,10 @@ impl ::protobuf::ProtobufEnum for ItemAttributesPartialState_ItemAttributeKind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ItemAttributesPartialState_ItemAttributeKind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ItemAttributesPartialState.ItemAttributeKind", file_descriptor_proto()) }) } } @@ -1557,8 +1530,8 @@ impl ::std::default::Default for ItemAttributesPartialState_ItemAttributeKind { } impl ::protobuf::reflect::ProtobufValue for ItemAttributesPartialState_ItemAttributeKind { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -1730,10 +1703,7 @@ impl ::protobuf::Message for ListAttributesPartialState { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1747,7 +1717,7 @@ impl ::protobuf::Message for ListAttributesPartialState { |m: &ListAttributesPartialState| { &m.no_value }, |m: &mut ListAttributesPartialState| { &mut m.no_value }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListAttributesPartialState", fields, file_descriptor_proto() @@ -1757,10 +1727,7 @@ impl ::protobuf::Message for ListAttributesPartialState { } fn default_instance() -> &'static ListAttributesPartialState { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ListAttributesPartialState, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(ListAttributesPartialState::new) } @@ -1782,8 +1749,8 @@ impl ::std::fmt::Debug for ListAttributesPartialState { } impl ::protobuf::reflect::ProtobufValue for ListAttributesPartialState { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1833,13 +1800,10 @@ impl ::protobuf::ProtobufEnum for ListAttributesPartialState_ListAttributeKind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("ListAttributesPartialState_ListAttributeKind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("ListAttributesPartialState.ListAttributeKind", file_descriptor_proto()) }) } } @@ -1855,8 +1819,8 @@ impl ::std::default::Default for ListAttributesPartialState_ListAttributeKind { } impl ::protobuf::reflect::ProtobufValue for ListAttributesPartialState_ListAttributeKind { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -2179,10 +2143,7 @@ impl ::protobuf::Message for UpdateItemAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2211,7 +2172,7 @@ impl ::protobuf::Message for UpdateItemAttributes { |m: &UpdateItemAttributes| { &m.old_attributes_checksum }, |m: &mut UpdateItemAttributes| { &mut m.old_attributes_checksum }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UpdateItemAttributes", fields, file_descriptor_proto() @@ -2221,10 +2182,7 @@ impl ::protobuf::Message for UpdateItemAttributes { } fn default_instance() -> &'static UpdateItemAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const UpdateItemAttributes, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(UpdateItemAttributes::new) } @@ -2249,8 +2207,8 @@ impl ::std::fmt::Debug for UpdateItemAttributes { } impl ::protobuf::reflect::ProtobufValue for UpdateItemAttributes { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2540,10 +2498,7 @@ impl ::protobuf::Message for UpdateListAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2567,7 +2522,7 @@ impl ::protobuf::Message for UpdateListAttributes { |m: &UpdateListAttributes| { &m.old_attributes_checksum }, |m: &mut UpdateListAttributes| { &mut m.old_attributes_checksum }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UpdateListAttributes", fields, file_descriptor_proto() @@ -2577,10 +2532,7 @@ impl ::protobuf::Message for UpdateListAttributes { } fn default_instance() -> &'static UpdateListAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const UpdateListAttributes, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(UpdateListAttributes::new) } @@ -2604,8 +2556,8 @@ impl ::std::fmt::Debug for UpdateListAttributes { } impl ::protobuf::reflect::ProtobufValue for UpdateListAttributes { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2975,10 +2927,7 @@ impl ::protobuf::Message for Op { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3012,7 +2961,7 @@ impl ::protobuf::Message for Op { |m: &Op| { &m.update_list_attributes }, |m: &mut Op| { &mut m.update_list_attributes }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Op", fields, file_descriptor_proto() @@ -3022,10 +2971,7 @@ impl ::protobuf::Message for Op { } fn default_instance() -> &'static Op { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Op, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Op::new) } @@ -3051,8 +2997,8 @@ impl ::std::fmt::Debug for Op { } impl ::protobuf::reflect::ProtobufValue for Op { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3096,13 +3042,10 @@ impl ::protobuf::ProtobufEnum for Op_Kind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("Op_Kind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("Op.Kind", file_descriptor_proto()) }) } } @@ -3118,8 +3061,8 @@ impl ::std::default::Default for Op_Kind { } impl ::protobuf::reflect::ProtobufValue for Op_Kind { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -3248,10 +3191,7 @@ impl ::protobuf::Message for OpList { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3260,7 +3200,7 @@ impl ::protobuf::Message for OpList { |m: &OpList| { &m.ops }, |m: &mut OpList| { &mut m.ops }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "OpList", fields, file_descriptor_proto() @@ -3270,10 +3210,7 @@ impl ::protobuf::Message for OpList { } fn default_instance() -> &'static OpList { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const OpList, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(OpList::new) } @@ -3294,8 +3231,8 @@ impl ::std::fmt::Debug for OpList { } impl ::protobuf::reflect::ProtobufValue for OpList { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3353,10 +3290,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x01\x20\x03(\x0b2\x03.OpB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/pubsub.rs b/protocol/src/pubsub.rs index a0daca49..15d4e2a0 100644 --- a/protocol/src/pubsub.rs +++ b/protocol/src/pubsub.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct Subscription { @@ -220,10 +220,7 @@ impl ::protobuf::Message for Subscription { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -242,7 +239,7 @@ impl ::protobuf::Message for Subscription { |m: &Subscription| { &m.status_code }, |m: &mut Subscription| { &mut m.status_code }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Subscription", fields, file_descriptor_proto() @@ -252,10 +249,7 @@ impl ::protobuf::Message for Subscription { } fn default_instance() -> &'static Subscription { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Subscription, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Subscription::new) } @@ -278,8 +272,8 @@ impl ::std::fmt::Debug for Subscription { } impl ::protobuf::reflect::ProtobufValue for Subscription { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -289,10 +283,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ us_code\x18\x03\x20\x01(\x05B\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() diff --git a/protocol/src/spirc.rs b/protocol/src/spirc.rs index e68f8110..ee626a2a 100644 --- a/protocol/src/spirc.rs +++ b/protocol/src/spirc.rs @@ -1,7 +1,7 @@ -// This file is generated by rust-protobuf 2.8.1. Do not edit +// This file is generated by rust-protobuf 2.14.0. Do not edit // @generated -// https://github.com/Manishearth/rust-clippy/issues/702 +// https://github.com/rust-lang/rust-clippy/issues/702 #![allow(unknown_lints)] #![allow(clippy::all)] @@ -24,7 +24,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// Generated files are compatible only with the same version /// of protobuf runtime. -const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_8_1; +// const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; #[derive(PartialEq,Clone,Default)] pub struct Frame { @@ -725,10 +725,7 @@ impl ::protobuf::Message for Frame { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -807,7 +804,7 @@ impl ::protobuf::Message for Frame { |m: &Frame| { &m.metadata }, |m: &mut Frame| { &mut m.metadata }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Frame", fields, file_descriptor_proto() @@ -817,10 +814,7 @@ impl ::protobuf::Message for Frame { } fn default_instance() -> &'static Frame { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Frame, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Frame::new) } @@ -855,8 +849,8 @@ impl ::std::fmt::Debug for Frame { } impl ::protobuf::reflect::ProtobufValue for Frame { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1377,10 +1371,7 @@ impl ::protobuf::Message for DeviceState { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1439,7 +1430,7 @@ impl ::protobuf::Message for DeviceState { |m: &DeviceState| { &m.metadata }, |m: &mut DeviceState| { &mut m.metadata }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "DeviceState", fields, file_descriptor_proto() @@ -1449,10 +1440,7 @@ impl ::protobuf::Message for DeviceState { } fn default_instance() -> &'static DeviceState { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const DeviceState, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(DeviceState::new) } @@ -1483,8 +1471,8 @@ impl ::std::fmt::Debug for DeviceState { } impl ::protobuf::reflect::ProtobufValue for DeviceState { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1669,10 +1657,7 @@ impl ::protobuf::Message for Capability { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1691,7 +1676,7 @@ impl ::protobuf::Message for Capability { |m: &Capability| { &m.stringValue }, |m: &mut Capability| { &mut m.stringValue }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Capability", fields, file_descriptor_proto() @@ -1701,10 +1686,7 @@ impl ::protobuf::Message for Capability { } fn default_instance() -> &'static Capability { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Capability, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Capability::new) } @@ -1727,8 +1709,8 @@ impl ::std::fmt::Debug for Capability { } impl ::protobuf::reflect::ProtobufValue for Capability { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -1860,10 +1842,7 @@ impl ::protobuf::Message for Goodbye { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1872,7 +1851,7 @@ impl ::protobuf::Message for Goodbye { |m: &Goodbye| { &m.reason }, |m: &mut Goodbye| { &mut m.reason }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Goodbye", fields, file_descriptor_proto() @@ -1882,10 +1861,7 @@ impl ::protobuf::Message for Goodbye { } fn default_instance() -> &'static Goodbye { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Goodbye, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Goodbye::new) } @@ -1906,8 +1882,8 @@ impl ::std::fmt::Debug for Goodbye { } impl ::protobuf::reflect::ProtobufValue for Goodbye { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2551,10 +2527,7 @@ impl ::protobuf::Message for State { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2633,7 +2606,7 @@ impl ::protobuf::Message for State { |m: &State| { &m.ad }, |m: &mut State| { &mut m.ad }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "State", fields, file_descriptor_proto() @@ -2643,10 +2616,7 @@ impl ::protobuf::Message for State { } fn default_instance() -> &'static State { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const State, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(State::new) } @@ -2681,8 +2651,8 @@ impl ::std::fmt::Debug for State { } impl ::protobuf::reflect::ProtobufValue for State { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -2939,10 +2909,7 @@ impl ::protobuf::Message for TrackRef { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -2966,7 +2933,7 @@ impl ::protobuf::Message for TrackRef { |m: &TrackRef| { &m.context }, |m: &mut TrackRef| { &mut m.context }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "TrackRef", fields, file_descriptor_proto() @@ -2976,10 +2943,7 @@ impl ::protobuf::Message for TrackRef { } fn default_instance() -> &'static TrackRef { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const TrackRef, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(TrackRef::new) } @@ -3003,8 +2967,8 @@ impl ::std::fmt::Debug for TrackRef { } impl ::protobuf::reflect::ProtobufValue for TrackRef { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3478,10 +3442,7 @@ impl ::protobuf::Message for Ad { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3530,7 +3491,7 @@ impl ::protobuf::Message for Ad { |m: &Ad| { &m.gid }, |m: &mut Ad| { &mut m.gid }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Ad", fields, file_descriptor_proto() @@ -3540,10 +3501,7 @@ impl ::protobuf::Message for Ad { } fn default_instance() -> &'static Ad { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Ad, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Ad::new) } @@ -3572,8 +3530,8 @@ impl ::std::fmt::Debug for Ad { } impl ::protobuf::reflect::ProtobufValue for Ad { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3751,10 +3709,7 @@ impl ::protobuf::Message for Metadata { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::MessageDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3768,7 +3723,7 @@ impl ::protobuf::Message for Metadata { |m: &Metadata| { &m.metadata }, |m: &mut Metadata| { &mut m.metadata }, )); - ::protobuf::reflect::MessageDescriptor::new::( + ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Metadata", fields, file_descriptor_proto() @@ -3778,10 +3733,7 @@ impl ::protobuf::Message for Metadata { } fn default_instance() -> &'static Metadata { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const Metadata, - }; + static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; unsafe { instance.get(Metadata::new) } @@ -3803,8 +3755,8 @@ impl ::std::fmt::Debug for Metadata { } impl ::protobuf::reflect::ProtobufValue for Metadata { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Message(self) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Message(self) } } @@ -3893,13 +3845,10 @@ impl ::protobuf::ProtobufEnum for MessageType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("MessageType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("MessageType", file_descriptor_proto()) }) } } @@ -3916,8 +3865,8 @@ impl ::std::default::Default for MessageType { } impl ::protobuf::reflect::ProtobufValue for MessageType { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -3985,13 +3934,10 @@ impl ::protobuf::ProtobufEnum for CapabilityType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("CapabilityType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("CapabilityType", file_descriptor_proto()) }) } } @@ -4008,8 +3954,8 @@ impl ::std::default::Default for CapabilityType { } impl ::protobuf::reflect::ProtobufValue for CapabilityType { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -4047,13 +3993,10 @@ impl ::protobuf::ProtobufEnum for PlayStatus { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::reflect::EnumDescriptor, - }; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new("PlayStatus", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::("PlayStatus", file_descriptor_proto()) }) } } @@ -4069,8 +4012,8 @@ impl ::std::default::Default for PlayStatus { } impl ::protobuf::reflect::ProtobufValue for PlayStatus { - fn as_ref(&self) -> ::protobuf::reflect::ProtobufValueRef { - ::protobuf::reflect::ProtobufValueRef::Enum(self.descriptor()) + fn as_ref(&self) -> ::protobuf::reflect::ReflectValueRef { + ::protobuf::reflect::ReflectValueRef::Enum(self.descriptor()) } } @@ -4143,10 +4086,7 @@ static file_descriptor_proto_data: &'static [u8] = b"\ se\x10\x02\x12\x16\n\x12kPlayStatusLoading\x10\x03\x1a\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy { - lock: ::protobuf::lazy::ONCE_INIT, - ptr: 0 as *const ::protobuf::descriptor::FileDescriptorProto, -}; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() From 4e4557da8d43bb01600afa232e0843cef4b25c89 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Wed, 22 Jul 2020 15:26:08 +0100 Subject: [PATCH 20/26] Update Cargo.lock and travis compiler version to 1.40.0 --- .travis.yml | 2 +- Cargo.lock | 1497 ++++++++++++++++++++++++--------------------------- 2 files changed, 701 insertions(+), 798 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1412ca4d..7d480fc9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,6 @@ language: rust rust: - - 1.33.0 + - 1.40.0 - stable - beta - nightly diff --git a/Cargo.lock b/Cargo.lock index f1df8cc4..7d414ca0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -18,7 +18,7 @@ dependencies = [ "aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "stream-cipher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -27,8 +27,8 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -37,27 +37,18 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "stream-cipher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "aho-corasick" -version = "0.7.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "alga" -version = "0.9.1" +version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libm 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -67,7 +58,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -76,8 +67,8 @@ name = "alsa-sys" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -85,63 +76,41 @@ name = "approx" version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "arc-swap" -version = "0.3.11" +version = "0.4.7" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "arrayvec" -version = "0.4.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "atty" -version = "0.2.13" +version = "0.2.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "autocfg" -version = "0.1.5" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] -name = "backtrace" -version = "0.3.33" +name = "autocfg" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "backtrace-sys" -version = "0.1.31" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "base64" version = "0.9.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -149,43 +118,39 @@ name = "base64" version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "bindgen" -version = "0.51.1" +version = "0.53.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "cexpr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "clang-sys 0.29.3 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "bit-set" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bit-vec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "bit-vec" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "bitflags" -version = "0.3.3" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -200,7 +165,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "bitflags" -version = "1.1.0" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -208,9 +173,9 @@ name = "block-buffer" version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -228,12 +193,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "block-padding" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -246,7 +211,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "byteorder" -version = "1.3.2" +version = "1.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -254,17 +219,8 @@ name = "bytes" version = "0.4.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "c2-chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -274,40 +230,39 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cc" -version = "1.0.47" +version = "1.0.58" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "cexpr" -version = "0.3.6" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "nom 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "cfg-if" -version = "0.1.9" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "chrono" -version = "0.4.7" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "clang-sys" -version = "0.28.1" +version = "0.29.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -316,7 +271,7 @@ name = "cloudabi" version = "0.0.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -324,7 +279,7 @@ name = "core-foundation-sys" version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -332,16 +287,16 @@ name = "coreaudio-rs" version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "coreaudio-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "coreaudio-sys" -version = "0.2.3" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)", + "bindgen 0.53.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -352,32 +307,34 @@ dependencies = [ "alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-deque" -version = "0.7.1" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "crossbeam-epoch" -version = "0.7.2" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -388,13 +345,33 @@ dependencies = [ "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "crossbeam-queue" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "crossbeam-utils" version = "0.6.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "crossbeam-utils" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -412,7 +389,7 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "stream-cipher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -428,8 +405,8 @@ name = "dns-sd" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -437,38 +414,18 @@ name = "env_logger" version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", - "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)", + "humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "error-chain" -version = "0.12.1" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "failure" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)", - "failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "failure_derive" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", - "synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -478,7 +435,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "fnv" -version = "1.0.6" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -491,7 +448,7 @@ name = "fuchsia-zircon" version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -502,7 +459,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "futures" -version = "0.1.28" +version = "0.1.29" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -510,8 +467,8 @@ name = "futures-cpupool" version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -524,7 +481,7 @@ name = "generic-array" version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -534,7 +491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "get_if_addrs-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -544,24 +501,25 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "getopts" -version = "0.2.19" +version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "getrandom" -version = "0.1.6" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -569,6 +527,14 @@ name = "glob" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" +[[package]] +name = "hermit-abi" +version = "0.1.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", +] + [[package]] name = "hex" version = "0.3.2" @@ -588,9 +554,9 @@ name = "hostname" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -600,10 +566,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "humantime" -version = "1.2.0" +version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -613,22 +579,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", "relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", + "time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)", "want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -638,10 +604,10 @@ version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -651,21 +617,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "iovec" -version = "0.1.2" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "itoa" -version = "0.4.4" +version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -675,8 +640,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "jack-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -684,8 +649,8 @@ name = "jack-sys" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -705,25 +670,27 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lazy_static" -version = "1.3.0" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + +[[package]] +name = "lazycell" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "lewton" version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libc" -version = "0.2.65" +version = "0.2.73" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -732,7 +699,7 @@ version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -741,13 +708,13 @@ name = "libloading" version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "libm" -version = "0.1.4" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -755,15 +722,15 @@ name = "libmdns" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "multimap 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", + "quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -772,7 +739,7 @@ name = "libpulse-sys" version = "0.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -781,8 +748,8 @@ version = "0.1.1" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-audio 0.1.1", @@ -791,16 +758,16 @@ dependencies = [ "librespot-metadata 0.1.1", "librespot-playback 0.1.1", "librespot-protocol 0.1.1", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-process 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-process 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -809,16 +776,16 @@ name = "librespot-audio" version = "0.1.1" dependencies = [ "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-core 0.1.1", "librespot-tremor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -831,21 +798,21 @@ dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "dns-sd 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "libmdns 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-core 0.1.1", "librespot-playback 0.1.1", "librespot-protocol 0.1.1", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", + "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -856,46 +823,46 @@ version = "0.1.1" dependencies = [ "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-protocol 0.1.1", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", - "serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)", - "sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", + "serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)", + "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "shannon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)", "uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)", - "vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)", + "vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "librespot-metadata" version = "0.1.1" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-core 0.1.1", "librespot-protocol 0.1.1", "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -904,17 +871,17 @@ name = "librespot-playback" version = "0.1.1" dependencies = [ "alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "librespot-audio 0.1.1", "librespot-core 0.1.1", "librespot-metadata 0.1.1", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "portaudio-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)", "shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -934,10 +901,10 @@ name = "librespot-tremor" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -947,11 +914,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "lock_api" -version = "0.1.5" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -959,15 +925,15 @@ name = "log" version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "log" -version = "0.4.7" +version = "0.4.11" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -982,69 +948,72 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "matrixmultiply" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rawpointer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "maybe-uninit" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "memchr" -version = "2.2.1" +version = "2.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "memoffset" -version = "0.5.1" +version = "0.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mime" -version = "0.3.13" +version = "0.3.16" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "mio" -version = "0.6.19" +version = "0.6.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mio-named-pipes" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "mio-uds" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1053,18 +1022,18 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", "ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "miow" -version = "0.3.3" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1072,32 +1041,33 @@ name = "multimap" version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "nalgebra" -version = "0.18.0" +version = "0.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "alga 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", + "alga 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", "approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", - "matrixmultiply 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", - "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)", + "typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "net2" -version = "0.2.33" +version = "0.2.34" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1106,23 +1076,18 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "nodrop" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "nom" -version = "4.2.3" +version = "5.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1130,62 +1095,75 @@ name = "num" version = "0.1.42" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-bigint" -version = "0.2.2" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-complex" -version = "0.2.3" +version = "0.2.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-integer" -version = "0.1.41" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-iter" -version = "0.1.39" +version = "0.1.41" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)", - "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "num-rational" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", + "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num-traits" -version = "0.2.8" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "num_cpus" -version = "1.10.1" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1193,7 +1171,7 @@ name = "ogg" version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1202,42 +1180,37 @@ version = "0.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "opaque-debug" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "owning_ref" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "parking_lot" -version = "0.7.1" +version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "parking_lot_core" -version = "0.4.0" +version = "0.6.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", "rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1246,11 +1219,11 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)", - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)", - "sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", + "sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1266,16 +1239,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "pkg-config" -version = "0.3.15" +version = "0.3.18" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "portaudio-rs" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1284,29 +1257,21 @@ name = "portaudio-sys" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "ppv-lite86" -version = "0.2.5" +version = "0.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "proc-macro2" -version = "0.4.30" +version = "1.0.19" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "proc-macro2" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1333,23 +1298,15 @@ dependencies = [ [[package]] name = "quick-error" -version = "1.2.2" +version = "1.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "quote" -version = "0.6.13" +version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "quote" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1357,7 +1314,7 @@ name = "rand" version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1367,10 +1324,10 @@ version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1380,9 +1337,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1390,28 +1347,28 @@ name = "rand" version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_jitter 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", "rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", "rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand" -version = "0.7.0" +version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -1420,17 +1377,17 @@ name = "rand_chacha" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", "rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_chacha" -version = "0.2.1" +version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1438,20 +1395,20 @@ name = "rand_core" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rand_core" -version = "0.4.0" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rand_core" -version = "0.5.0" +version = "0.5.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1467,7 +1424,7 @@ name = "rand_hc" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1483,9 +1440,9 @@ name = "rand_jitter" version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1495,10 +1452,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)", "fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", "rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1506,8 +1463,8 @@ name = "rand_pcg" version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", - "rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1520,7 +1477,7 @@ dependencies = [ [[package]] name = "rawpointer" -version = "0.1.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1533,23 +1490,20 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.1.56" +version = "0.1.57" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "regex" -version = "1.3.4" +version = "1.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "aho-corasick 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)", - "memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "regex-syntax 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)", - "thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "regex-syntax" -version = "0.6.15" +version = "0.6.18" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1557,15 +1511,15 @@ name = "relay" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "remove_dir_all" -version = "0.5.2" +version = "0.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1574,8 +1528,8 @@ version = "0.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "nalgebra 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "nalgebra 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1584,15 +1538,10 @@ version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "rustc-demangle" -version = "0.1.15" -source = "registry+https://github.com/rust-lang/crates.io-index" - [[package]] name = "rustc-hash" version = "1.1.0" @@ -1608,12 +1557,12 @@ dependencies = [ [[package]] name = "ryu" -version = "1.0.0" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "safemem" -version = "0.3.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1623,12 +1572,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "scopeguard" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "scopeguard" -version = "1.0.0" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -1636,9 +1580,9 @@ name = "sdl2" version = "0.32.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", "sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1649,8 +1593,8 @@ name = "sdl2-sys" version = "0.32.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1668,49 +1612,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde" -version = "1.0.97" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "serde_derive" -version = "1.0.97" +version = "1.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "serde_json" -version = "1.0.40" +version = "1.0.56" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)", - "ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)", + "itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)", + "ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sha-1" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "sha2" -version = "0.8.0" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", "digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)", "fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", + "opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1718,7 +1662,7 @@ name = "shannon" version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", + "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1731,22 +1675,13 @@ name = "shlex" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "signal-hook" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "signal-hook-registry 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "signal-hook-registry" -version = "1.1.0" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1766,29 +1701,22 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "smallvec" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "socket2" -version = "0.3.10" +version = "0.6.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] -name = "spin" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "stable_deref_trait" -version = "1.1.1" +name = "socket2" +version = "0.3.12" source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", +] [[package]] name = "stdweb" @@ -1797,7 +1725,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "stream-cipher" -version = "0.3.0" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1810,23 +1738,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "syn" -version = "0.15.42" +version = "1.0.35" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "synstructure" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)", - "quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)", - "syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)", - "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)", + "quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1839,71 +1756,67 @@ name = "tempfile" version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)", + "remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "termcolor" -version = "1.0.5" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "thread_local" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "time" -version = "0.1.42" +version = "0.1.43" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "tinyvec" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "tokio" version = "0.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-udp 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-uds 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-codec" -version = "0.1.1" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1912,72 +1825,72 @@ version = "0.1.17" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", "tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-current-thread" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-executor" -version = "0.1.8" +version = "0.1.10" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-fs" -version = "0.1.6" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-io" -version = "0.1.12" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-process" -version = "0.2.4" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-named-pipes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1985,34 +1898,34 @@ name = "tokio-proto" version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", - "net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", + "net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", "tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-reactor" -version = "0.1.9" +version = "0.1.12" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", + "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2020,103 +1933,103 @@ name = "tokio-service" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-signal" -version = "0.2.7" +version = "0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-sync" -version = "0.1.6" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-tcp" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-threadpool" -version = "0.1.15" +version = "0.1.18" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-timer" -version = "0.2.11" +version = "0.2.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", + "crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-udp" -version = "0.1.3" +version = "0.1.6" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "tokio-uds" -version = "0.2.5" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)", - "mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", - "tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", + "mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)", + "mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)", + "tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2126,15 +2039,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "typenum" -version = "1.10.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicase" -version = "2.4.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2147,25 +2060,20 @@ dependencies = [ [[package]] name = "unicode-normalization" -version = "0.1.8" +version = "0.1.13" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)", + "tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "unicode-width" -version = "0.1.5" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "unicode-xid" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" - -[[package]] -name = "unicode-xid" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2188,17 +2096,16 @@ dependencies = [ [[package]] name = "vergen" -version = "3.0.4" +version = "3.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", - "failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", + "chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "version_check" -version = "0.1.5" +version = "0.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] @@ -2211,7 +2118,7 @@ name = "vorbis" version = "0.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis-encoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2225,9 +2132,9 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -2237,9 +2144,20 @@ version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "vorbis-sys" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", + "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2248,10 +2166,10 @@ version = "0.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)", + "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)", - "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", + "vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2259,11 +2177,16 @@ name = "want" version = "0.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)", - "log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)", + "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", + "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] +[[package]] +name = "wasi" +version = "0.9.0+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" + [[package]] name = "winapi" version = "0.2.8" @@ -2271,7 +2194,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi" -version = "0.3.7" +version = "0.3.9" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -2290,10 +2213,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "winapi-util" -version = "0.1.2" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", + "winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2301,15 +2224,6 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -[[package]] -name = "wincolor" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)", - "winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "ws2_32-sys" version = "0.2.1" @@ -2324,153 +2238,148 @@ dependencies = [ "checksum aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d2e5b0458ea3beae0d1d8c0f3946564f8e10f90646cf78c06b4351052058d1ee" "checksum aes-soft 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "cfd7e7ae3f9a1fb5c03b389fc6bb9a51400d0c13053f0dca698c832bfd893a0d" "checksum aesni 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2f70a6b5f971e473091ab7cfb5ffac6cde81666c4556751d8d5620ead8abf100" -"checksum aho-corasick 0.7.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d5e63fd144e18ba274ae7095c0197a870a7b9468abc801dd62f190d80817d2ec" -"checksum alga 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d708cb68c7106ed1844de68f50f0157a7788c2909a6926fad5a87546ef6a4ff8" +"checksum alga 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "4f823d037a7ec6ea2197046bafd4ae150e6bc36f9ca347404f46a46823fa84f2" "checksum alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b4a0d4ebc8b23041c5de9bc9aee13b4bad844a589479701f31a5934cfe4aeb32" "checksum alsa-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b0edcbbf9ef68f15ae1b620f722180b82a98b6f0628d30baa6b8d2a5abc87d58" "checksum approx 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f0e60b75072ecd4168020818c0107f2857bb6c4e64252d8d3983f6263b40a5c3" -"checksum arc-swap 0.3.11 (registry+https://github.com/rust-lang/crates.io-index)" = "bc4662175ead9cd84451d5c35070517777949a2ed84551764129cedb88384841" -"checksum arrayvec 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "b8d73f9beda665eaa98ab9e4f7442bd4e7de6652587de55b2525e52e29c1b0ba" -"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90" -"checksum autocfg 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "22130e92352b948e7e82a49cdb0aa94f2211761117f29e052dd397c1ac33542b" -"checksum backtrace 0.3.33 (registry+https://github.com/rust-lang/crates.io-index)" = "88fb679bc9af8fa639198790a77f52d345fe13656c08b43afa9424c206b731c6" -"checksum backtrace-sys 0.1.31 (registry+https://github.com/rust-lang/crates.io-index)" = "82a830b4ef2d1124a711c71d263c5abdc710ef8e907bd508c88be475cebc422b" +"checksum arc-swap 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "4d25d88fd6b8041580a654f9d0c581a047baee2b3efee13275f2fc392fc75034" +"checksum atty 0.2.14 (registry+https://github.com/rust-lang/crates.io-index)" = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +"checksum autocfg 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1d49d90015b3c36167a20fe2810c5cd875ad504b39cff3d4eae7977e6b7c1cb2" +"checksum autocfg 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f8aac770f1885fd7e387acedd76065302551364496e46b3dd00860b2f8359b9d" "checksum base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0b25d992356d2eb0ed82172f5248873db5560c4721f564b13cb5193bda5e668e" "checksum base64 0.9.3 (registry+https://github.com/rust-lang/crates.io-index)" = "489d6c0ed21b11d038c31b6ceccca973e65d73ba3bd8ecb9a2babf5546164643" -"checksum bindgen 0.51.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ebd71393f1ec0509b553aa012b9b58e81dadbdff7130bd3b8cba576e69b32f75" -"checksum bit-set 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e84c238982c4b1e1ee668d136c510c67a13465279c0cb367ea6baf6310620a80" -"checksum bit-vec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f59bbe95d4e52a6398ec21238d31577f2b28a9d86807f06ca59d191d8440d0bb" -"checksum bitflags 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "32866f4d103c4e438b1db1158aa1b1a80ee078e5d77a59a2f906fd62a577389c" +"checksum bindgen 0.53.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c72a978d268b1d70b0e963217e60fdabd9523a941457a6c42a7315d15c7e89e5" +"checksum bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" +"checksum bit-vec 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5f0dc55f2d8a1a85650ac47858bb001b4c0dd73d79e3c455a842925e68d29cd3" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4efd02e230a02e18f92fc2735f44597385ed02ad8f831e7c1c1156ee5e1ab3a5" -"checksum bitflags 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3d155346769a6855b86399e9bc3814ab343cd3d62c7e985113d46a0ec3c281fd" +"checksum bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" "checksum block-buffer 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b" "checksum block-cipher-trait 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "1c924d49bd09e7c06003acda26cd9742e796e34282ec6c1189404dee0c1f4774" "checksum block-modes 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "31aa8410095e39fdb732909fb5730a48d5bd7c2e3cd76bd1b07b3dbea130c529" -"checksum block-padding 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6d4dc3af3ee2e12f3e5d224e5e1e3d73668abbeb69e566d361f7d5563a4fdf09" +"checksum block-padding 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5" "checksum byte-tools 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7" -"checksum byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c3dd8985a7111efc5c80b44e23ecdd8c007de8ade3b96595387e812b957cf5" +"checksum byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "08c48aae112d48ed9f069b33538ea9e3e90aa263cfa3d1c24309612b1f7472de" "checksum bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)" = "206fdffcfa2df7cbe15601ef46c813fce0965eb3286db6b56c583b814b51c81c" -"checksum c2-chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7d64d04786e0f528460fc884753cf8dddcc466be308f6026f8e355c41a0e4101" "checksum c_linked_list 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4964518bd3b4a8190e832886cdc0da9794f12e8e6c1613a9e90ff331c4c8724b" -"checksum cc 1.0.47 (registry+https://github.com/rust-lang/crates.io-index)" = "aa87058dce70a3ff5621797f1506cb837edd02ac4c0ae642b4542dce802908b8" -"checksum cexpr 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "fce5b5fb86b0c57c20c834c1b412fd09c77c8a59b9473f86272709e78874cd1d" -"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33" -"checksum chrono 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "77d81f58b7301084de3b958691458a53c3f7e0b1d702f77e550b6a88e3a88abe" -"checksum clang-sys 0.28.1 (registry+https://github.com/rust-lang/crates.io-index)" = "81de550971c976f176130da4b2978d3b524eaa0fd9ac31f3ceb5ae1231fb4853" +"checksum cc 1.0.58 (registry+https://github.com/rust-lang/crates.io-index)" = "f9a06fb2e53271d7c279ec1efea6ab691c35a2ae67ec0d91d7acec0caf13b518" +"checksum cexpr 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f4aedb84272dbe89af497cf81375129abda4fc0a9e7c5d317498c15cc30c0d27" +"checksum cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" +"checksum chrono 0.4.13 (registry+https://github.com/rust-lang/crates.io-index)" = "c74d84029116787153e02106bf53e66828452a4b325cc8652b788b5967c0a0b6" +"checksum clang-sys 0.29.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fe6837df1d5cba2397b835c8530f51723267e16abbf83892e9e5af4f0e5dd10a" "checksum cloudabi 0.0.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f" "checksum core-foundation-sys 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "716c271e8613ace48344f723b60b900a93150271e5be206212d052bbc0883efa" "checksum coreaudio-rs 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f229761965dad3e9b11081668a6ea00f1def7aa46062321b5ec245b834f6e491" -"checksum coreaudio-sys 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7e8f5954c1c7ccb55340443e8b29fca24013545a5e7d72c1ca7db4fc02b982ce" +"checksum coreaudio-sys 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "d6570ee6e089131e928d5ec9236db9e818aa3cf850f48b0eec6ef700571271d4" "checksum cpal 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58ae1ed6536b1b233f5e3aeb6997a046ddb4d05e3f61701b58a92eb254a829e" -"checksum crossbeam-deque 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b18cd2e169ad86297e6bc0ad9aa679aee9daa4f19e8163860faf7c164e4f5a71" -"checksum crossbeam-epoch 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "fedcd6772e37f3da2a9af9bf12ebe046c0dfe657992377b4df982a2b54cd37a9" +"checksum crossbeam-deque 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "9f02af974daeee82218205558e51ec8768b48cf524bd01d550abe5573a608285" +"checksum crossbeam-epoch 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "058ed274caafc1f60c4997b5fc07bf7dc7cca454af7c6e81edffe5f33f70dace" "checksum crossbeam-queue 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7c979cd6cfe72335896575c6b5688da489e420d36a27a0b9eb0c73db574b4a4b" +"checksum crossbeam-queue 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "774ba60a54c213d409d5353bda12d49cd68d14e45036a285234c8d6f91f92570" "checksum crossbeam-utils 0.6.6 (registry+https://github.com/rust-lang/crates.io-index)" = "04973fa96e96579258a5091af6003abde64af786b860f18622b82e026cca60e6" +"checksum crossbeam-utils 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" "checksum crypto-mac 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5" "checksum ctr 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "022cd691704491df67d25d006fe8eca083098253c4d43516c2206479c58c6736" "checksum digest 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f3d0c8c8752312f9713efd397ff63acb9f85585afbf179282e720e7704954dd5" "checksum dns-sd 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d748509dea20228f63ba519bf142ce2593396386125b01f5b0d6412dab972087" "checksum env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "aafcde04e90a5226a6443b7aabdb016ba2f8307c847d524724bd9b346dd1a2d3" -"checksum error-chain 0.12.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ab49e9dcb602294bc42f9a7dfc9bc6e936fca4418ea300dbfb84fe16de0b7d9" -"checksum failure 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "795bd83d3abeb9220f257e597aa0080a508b27533824adf336529648f6abf7e2" -"checksum failure_derive 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "ea1063915fd7ef4309e222a5a07cf9c319fb9c7836b1f89b85458672dbb127e1" +"checksum error-chain 0.12.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d371106cc88ffdfb1eabd7111e432da544f16f3e2d7bf1dfe8bf575f1df045cd" "checksum fake-simd 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" -"checksum fnv 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2fad85553e09a6f881f739c29f0b00b0f01357c743266d478b68951ce23285f3" +"checksum fnv 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" "checksum fuchsia-cprng 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "a06f77d526c1a601b7c4cdd98f54b5eaabffc14d5f2f0296febdc7f357c6d3ba" "checksum fuchsia-zircon 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82" "checksum fuchsia-zircon-sys 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7" -"checksum futures 0.1.28 (registry+https://github.com/rust-lang/crates.io-index)" = "45dc39533a6cae6da2b56da48edae506bb767ec07370f86f70fc062e9d435869" +"checksum futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)" = "1b980f2816d6ee8673b6517b52cb0e808a180efc92e5c19d02cdda79066703ef" "checksum futures-cpupool 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "ab90cde24b3319636588d0c35fe03b1333857621051837ed769faefb4c2162e4" "checksum gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)" = "8f5f3913fa0bfe7ee1fd8248b6b9f42a5af4b9d65ec2dd2c3c26132b950ecfc2" "checksum generic-array 0.12.3 (registry+https://github.com/rust-lang/crates.io-index)" = "c68f0274ae0e023facc3c97b2e00f076be70e254bc851d972503b328db79b2ec" "checksum get_if_addrs 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "abddb55a898d32925f3148bd281174a68eeb68bbfd9a5938a57b18f506ee4ef7" "checksum get_if_addrs-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "0d04f9fb746cf36b191c00f3ede8bde9c8e64f9f4b05ae2694a9ccf5e3f5ab48" -"checksum getopts 0.2.19 (registry+https://github.com/rust-lang/crates.io-index)" = "72327b15c228bfe31f1390f93dd5e9279587f0463836393c9df719ce62a3e450" -"checksum getrandom 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e65cce4e5084b14874c4e7097f38cab54f47ee554f9194673456ea379dcc4c55" +"checksum getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)" = "14dbbfd5c71d70241ecf9e6f13737f7b5ce823821063188d7e46c41d371eebd5" +"checksum getrandom 0.1.14 (registry+https://github.com/rust-lang/crates.io-index)" = "7abc8dd8451921606d809ba32e95b6111925cd2906060d2dcc29c070220503eb" "checksum glob 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +"checksum hermit-abi 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "3deed196b6e7f9e44a2ae8d94225d80302d81208b1bb673fd21fe634645c85a9" "checksum hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "805026a5d0141ffc30abb3be3173848ad46a1b1664fe632428479619a3644d77" "checksum hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5dcb5e64cda4c23119ab41ba960d1e170a774c8e4b9d9e6a9bc18aabf5e59695" "checksum hostname 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3c731c3e10504cc8ed35cfe2f1db4c9274c3d35fa486e3b31df46f068ef3e867" "checksum httparse 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "cd179ae861f0c2e53da70d892f5f3029f9594be0c41dc5269cd371691b1dc2f9" -"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114" +"checksum humantime 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df004cfca50ef23c36850aaaa59ad52cc70d0e90243c3c7737a4dd32dc7a3c4f" "checksum hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)" = "34a590ca09d341e94cddf8e5af0bbccde205d5fbc2fa3c09dd67c7f85cea59d7" "checksum hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "44f0925de2747e481e6e477dd212c25e8f745567f02f6182e04d27b97c3fbece" "checksum idna 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "38f09e0f0b1fb55fdee1f17470ad800da77af5186a1a76c026b679358b7e844e" -"checksum iovec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dbe6e417e7d0975db6512b90796e8ce223145ac4e33c377e4a42882a0e88bb08" -"checksum itoa 0.4.4 (registry+https://github.com/rust-lang/crates.io-index)" = "501266b7edd0174f8530248f87f99c88fbe60ca4ef3dd486835b8d8d53136f7f" +"checksum iovec 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e" +"checksum itoa 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "dc6f3ad7b9d11a0c00842ff8de1b60ee58661048eb8049ed33c73594f359d7e6" "checksum jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)" = "1e15fc592e2e5a74a105ff507083c04db1aa20ba1b90d425362ba000e57422df" "checksum jack-sys 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c0d4ca501477fd3cd93a36df581046e5d6338ed826cf7e9b8d302603521e6cc3" "checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d" "checksum language-tags 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" -"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14" +"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f" "checksum lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)" = "8d542c1a317036c45c2aa1cf10cc9d403ca91eb2d333ef1a4917e5cb10628bd0" -"checksum libc 0.2.65 (registry+https://github.com/rust-lang/crates.io-index)" = "1a31a0627fdf1f6a39ec0dd577e101440b7db22672c0901fe00a9a6fbb5c24e8" +"checksum libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)" = "bd7d4bd64732af4bf3a67f367c27df8520ad7e230c5817b8ff485864d80242b9" "checksum libloading 0.4.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fd38073de8f7965d0c17d30546d4bb6da311ab428d1c7a3fc71dff7f9d4979b9" "checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753" -"checksum libm 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7fc7aa29613bd6a620df431842069224d8bc9011086b1db4c0e0cd47fa03ec9a" +"checksum libm 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" "checksum libmdns 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "966e0f9cc15be41e9dbfcd74fd9c04cf69d3c0ec43fc56aa28f5e4da4e545c38" "checksum libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9bb11b06faf883500c1b625cf4453e6c7737e9df9c7ba01df3f84b22b083e4ac" "checksum librespot-tremor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b155a7dc4e4d272e01c37a1b85c1ee1bee7f04980ad4a7784c1a6e0f2de5929b" "checksum linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bfae20f6b19ad527b550c223fddc3077a547fc70cda94b9b566575423fd303ee" -"checksum lock_api 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "62ebf1391f6acad60e5c8b43706dde4582df75c06698ab44511d15016bc2442c" +"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75" "checksum log 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "e19e8d5c34a3e0e2223db8e060f9e8264aeeb5c5fc64a4ee9965c062211c024b" -"checksum log 0.4.7 (registry+https://github.com/rust-lang/crates.io-index)" = "c275b6ad54070ac2d665eef9197db647b32239c9d244bfb6f041a766d00da5b3" +"checksum log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)" = "4fabed175da42fed1fa0746b0ea71f412aa9d35e76e95e59b192c64b9dc2bf8b" "checksum match_cfg 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4" "checksum matches 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "7ffc5c5338469d4d3ea17d269fa8ea3512ad247247c30bd2df69e68309ed0a08" -"checksum matrixmultiply 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dcfed72d871629daa12b25af198f110e8095d7650f5f4c61c5bac28364604f9b" -"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e" -"checksum memoffset 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ce6075db033bbbb7ee5a0bbd3a3186bbae616f57fb001c485c7ff77955f8177f" -"checksum mime 0.3.13 (registry+https://github.com/rust-lang/crates.io-index)" = "3e27ca21f40a310bd06d9031785f4801710d566c184a6e15bad4f1d9b65f9425" -"checksum mio 0.6.19 (registry+https://github.com/rust-lang/crates.io-index)" = "83f51996a3ed004ef184e16818edc51fadffe8e7ca68be67f9dee67d84d0ff23" -"checksum mio-named-pipes 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "f5e374eff525ce1c5b7687c4cef63943e7686524a387933ad27ca7ec43779cb3" -"checksum mio-uds 0.6.7 (registry+https://github.com/rust-lang/crates.io-index)" = "966257a94e196b11bb43aca423754d87429960a768de9414f3691d6957abf125" +"checksum matrixmultiply 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "d4f7ec66360130972f34830bfad9ef05c6610a43938a467bcc9ab9369ab3478f" +"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" +"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" +"checksum memoffset 0.5.5 (registry+https://github.com/rust-lang/crates.io-index)" = "c198b026e1bbf08a937e94c6c60f9ec4a2267f5b0d2eec9c1b21b061ce2be55f" +"checksum mime 0.3.16 (registry+https://github.com/rust-lang/crates.io-index)" = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +"checksum mio 0.6.22 (registry+https://github.com/rust-lang/crates.io-index)" = "fce347092656428bc8eaf6201042cb551b8d67855af7374542a92a0fbfcac430" +"checksum mio-named-pipes 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "0840c1c50fd55e521b247f949c241c9997709f23bd7f023b9762cd561e935656" +"checksum mio-uds 0.6.8 (registry+https://github.com/rust-lang/crates.io-index)" = "afcb699eb26d4332647cc848492bbc15eafb26f08d0304550d5aa1f612e066f0" "checksum miow 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8c1f2f3b1cf331de6896aabf6e9d55dca90356cc9960cca7eaaf408a355ae919" -"checksum miow 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "396aa0f2003d7df8395cb93e09871561ccc3e785f0acb369170e8cc74ddf9226" +"checksum miow 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "07b88fb9795d4d36d62a012dfbf49a8f5cf12751f36d31a9dbe66d528e58979e" "checksum multimap 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d8883adfde9756c1d30b0f519c9b8c502a94b41ac62f696453c37c7fc0a958ce" -"checksum nalgebra 0.18.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e12856109b5cb8e2934b5e45e4624839416e1c6c1f7d286711a7a66b79db29d" -"checksum net2 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "42550d9fb7b6684a6d404d9fa7250c2eb2646df731d1c06afc06dcee9e1bcf88" +"checksum nalgebra 0.18.1 (registry+https://github.com/rust-lang/crates.io-index)" = "aaa9fddbc34c8c35dd2108515587b8ce0cab396f17977b8c738568e4edb521a2" +"checksum net2 0.2.34 (registry+https://github.com/rust-lang/crates.io-index)" = "2ba7c918ac76704fb42afcbbb43891e72731f3dcca3bef2a19786297baf14af7" "checksum nix 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a2c5afeb0198ec7be8569d666644b574345aad2e95a53baf3a532da3e0f3fb32" -"checksum nodrop 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "2f9667ddcc6cc8a43afc9b7917599d7216aa09c463919ea32c59ed6cac8bc945" -"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6" +"checksum nom 5.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "ffb4262d26ed83a1c0a33a38fe2bb15797329c85770da05e6b828ddb782627af" "checksum num 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "4703ad64153382334aa8db57c637364c322d3372e097840c72000dabdcf6156e" -"checksum num-bigint 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "57450397855d951f1a41305e54851b1a7b8f5d2e349543a02a2effe25459f718" -"checksum num-complex 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "fcb0cf31fb3ff77e6d2a6ebd6800df7fdcd106f2ad89113c9130bcd07f93dffc" -"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09" -"checksum num-iter 0.1.39 (registry+https://github.com/rust-lang/crates.io-index)" = "76bd5272412d173d6bf9afdf98db8612bbabc9a7a830b7bfc9c188911716132e" -"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32" -"checksum num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)" = "bcef43580c035376c0705c42792c294b66974abbfd2789b511784023f71f3273" +"checksum num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)" = "090c7f9998ee0ff65aa5b723e4009f7b217707f1fb5ea551329cc4d6231fb304" +"checksum num-complex 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b6b19411a9719e753aff12e5187b74d60d3dc449ec3f4dc21e3989c3f554bc95" +"checksum num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "8d59457e662d541ba17869cf51cf177c0b5f0cbf476c66bdc90bf1edac4f875b" +"checksum num-iter 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e6b7c748f995c4c29c5f5ae0248536e04a5739927c74ec0fa564805094b9f" +"checksum num-rational 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" +"checksum num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)" = "ac267bcc07f48ee5f8935ab0d24f316fb722d7a1292e2913f0cc196b29ffd611" +"checksum num_cpus 1.13.0 (registry+https://github.com/rust-lang/crates.io-index)" = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" "checksum ogg 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d79f1db9148be9d0e174bb3ac890f6030fcb1ed947267c5a91ee4c91b5a91e15" "checksum ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "a95b8c172e17df1a41bf8d666301d3b2c4efeb90d9d0415e2a4dc0668b35fdb2" -"checksum opaque-debug 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "93f5bb2e8e8dec81642920ccff6b61f1eb94fa3020c5a325c9851ff604152409" -"checksum owning_ref 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "49a4b8ea2179e6a2e27411d3bca09ca6dd630821cf6894c6c7c8467a8ee7ef13" -"checksum parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ab41b4aed082705d1056416ae4468b6ea99d52599ecf3169b00088d43113e337" -"checksum parking_lot_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94c8c7923936b28d546dfd14d4472eaf34c99b14e1c973a32b3e6d4eb04298c9" +"checksum opaque-debug 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2839e79665f131bdb5782e51f2c6c9599c133c6098982a54c794358bf432529c" +"checksum parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f842b1982eb6c2fe34036a4fbfb06dd185a3f5c8edfaacdf7d1ea10b07de6252" +"checksum parking_lot_core 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b876b1b9e7ac6e1a74a6da34d25c42e17e8862aa409cbbbdcfc8d86c6f3bc62b" "checksum pbkdf2 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "006c038a43a45995a9670da19e67600114740e8511d4333bf97a56e66a7542d9" "checksum peeking_take_while 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099" "checksum percent-encoding 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" -"checksum pkg-config 0.3.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7c1d2cfa5a714db3b5f24f0915e74fcdf91d09d496ba61329705dda7774d2af" -"checksum portaudio-rs 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "fc0e6b38f00fae9dde9a9832a2b54405988c6dcaf2870e6f9551546b447bbd7f" +"checksum pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)" = "d36492546b6af1463394d46f0c834346f31548646f6ba10849802c9c9a27ac33" +"checksum portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "cdb6b5eff96ccc9bf44d34c379ab03ae944426d83d1694345bdf8159d561d562" "checksum portaudio-sys 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5194a4fa953b4ffd851c320ef6f0484cd7278cb7169ea9d6c433e49b23f7b7f5" -"checksum ppv-lite86 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "e3cbf9f658cdb5000fcf6f362b8ea2ba154b9f146a61c7a20d647034c6b6561b" -"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759" -"checksum proc-macro2 1.0.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6c09721c6781493a2a492a96b5a5bf19b65917fe6728884e7c44dd0c60ca3435" +"checksum ppv-lite86 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "237a5ed80e274dbc66f86bd59c1e25edc039660be53194b5fe0a482e0f2612ea" +"checksum proc-macro2 1.0.19 (registry+https://github.com/rust-lang/crates.io-index)" = "04f5f085b5d71e2188cb8271e5da0161ad52c3f227a661a3c135fdf28e258b12" "checksum protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8e86d370532557ae7573551a1ec8235a0f8d6cb276c7c9e6aa490b511c447485" "checksum protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "de113bba758ccf2c1ef816b127c958001b7831136c9bc3f8e9ec695ac4e82b0c" "checksum protobuf-codegen-pure 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d1a4febc73bf0cada1d77c459a0c8e5973179f1cfd5b0f1ab789d45b17b6440" -"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0" -"checksum quote 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6ce23b6b870e8f94f81fb0a363d65d86675884b34a09043c81e5562f11c1f8e1" -"checksum quote 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "053a8c8bcc71fcce321828dc897a98ab9760bef03a4fc36693c231e5b3216cfe" +"checksum quick-error 1.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1d01941d82fa2ab50be1e79e6714289dd7cde78eba4c074bc5a4374f650dfe0" +"checksum quote 1.0.7 (registry+https://github.com/rust-lang/crates.io-index)" = "aa563d17ecb180e500da1cfd2b028310ac758de548efdd203e18f283af693f37" "checksum rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)" = "64ac302d8f83c0c1974bf758f6b041c6c8ada916fbb44a609158ca8b064cc76c" "checksum rand 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "552840b97013b1a26992c11eac34bdd778e464601a4c2054b5f0bff7c6761293" "checksum rand 0.5.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c618c47cd3ebd209790115ab837de41425723956ad3ce2e6a7f09890947cacb9" "checksum rand 0.6.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d71dacdc3c88c1fde3885a3be3fbab9f35724e6ce99467f7d9c5026132184ca" -"checksum rand 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d47eab0e83d9693d40f825f86948aa16eff6750ead4bdffc4ab95b8b3a7f052c" +"checksum rand 0.7.3 (registry+https://github.com/rust-lang/crates.io-index)" = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" "checksum rand_chacha 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "556d3a1ca6600bfcbab7c7c91ccb085ac7fbbcd70e008a98742e7847f4f7bcef" -"checksum rand_chacha 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "03a2a90da8c7523f554344f921aa97283eadf6ac484a6d2a7d0212fa7f8d6853" +"checksum rand_chacha 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" "checksum rand_core 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6fdeb83b075e8266dcc8762c22776f6877a63111121f5f8c7411e5be7eed4b" -"checksum rand_core 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d0e7a549d590831370895ab7ba4ea0c1b6b011d106b5ff2da6eee112615e6dc0" -"checksum rand_core 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "615e683324e75af5d43d8f7a39ffe3ee4a9dc42c5c701167a71dc59c3a493aca" +"checksum rand_core 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9c33a3c44ca05fa6f1807d8e6743f3824e8509beca625669633be0acbdf509dc" +"checksum rand_core 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" "checksum rand_hc 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b40677c7be09ae76218dc623efbf7b18e34bced3f38883af07bb75630a21bc4" "checksum rand_hc 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" "checksum rand_isaac 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "ded997c9d5f13925be2a6fd7e66bf1872597f759fd9dd93513dd7e92e5a5ee08" @@ -2478,95 +2387,89 @@ dependencies = [ "checksum rand_os 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "7b75f676a1e053fc562eafbb47838d67c84801e38fc1ba459e8f180deabd5071" "checksum rand_pcg 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "abf9b09b01790cfe0364f52bf32995ea3c39f4d2dd011eac241d2914146d0b44" "checksum rand_xorshift 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf7e9e623549b0e21f6e97cf8ecf247c1a8fd2e8a992ae265314300b2455d5c" -"checksum rawpointer 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ebac11a9d2e11f2af219b8b8d833b76b1ea0e054aa0e8d8e9e4cbde353bdf019" +"checksum rawpointer 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" "checksum rdrand 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "678054eb77286b51581ba43620cc911abf02758c91f93f479767aed0f90458b2" -"checksum redox_syscall 0.1.56 (registry+https://github.com/rust-lang/crates.io-index)" = "2439c63f3f6139d1b57529d16bc3b8bb855230c8efcc5d3a896c8bea7c3b1e84" -"checksum regex 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "322cf97724bea3ee221b78fe25ac9c46114ebb51747ad5babd51a2fc6a8235a8" -"checksum regex-syntax 0.6.15 (registry+https://github.com/rust-lang/crates.io-index)" = "7246cd0a0a6ec2239a5405b2b16e3f404fa0dcc6d28f5f5b877bf80e33e0f294" +"checksum redox_syscall 0.1.57 (registry+https://github.com/rust-lang/crates.io-index)" = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce" +"checksum regex 1.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "9c3780fcf44b193bc4d09f36d2a3c87b251da4a046c87795a0d35f4f927ad8e6" +"checksum regex-syntax 0.6.18 (registry+https://github.com/rust-lang/crates.io-index)" = "26412eb97c6b088a6997e05f69403a802a92d520de2f8e63c2b65f9e0f47c4e8" "checksum relay 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "1576e382688d7e9deecea24417e350d3062d97e32e45d70b1cde65994ff1489a" -"checksum remove_dir_all 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "4a83fa3702a688b9359eccba92d153ac33fd2e8462f9e0e3fdf155239ea7792e" +"checksum remove_dir_all 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" "checksum rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5d0f961b254e66d147a7b550c78b01308934c97d807a34b417fd0f5a0a0f3a2d" "checksum rpassword 3.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c34fa7bcae7fca3c8471e8417088bbc3ad9af8066b0ecf4f3c0d98a0d772716e" -"checksum rustc-demangle 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "a7f4dccf6f4891ebcc0c39f9b6eb1a83b9bf5d747cb439ec6fba4f3b977038af" "checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" "checksum rustc_version 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -"checksum ryu 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c92464b447c0ee8c4fb3824ecc8383b81717b9f1e74ba2e72540aef7b9f82997" -"checksum safemem 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8dca453248a96cb0749e36ccdfe2b0b4e54a61bfef89fb97ec621eb8e0a93dd9" +"checksum ryu 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" +"checksum safemem 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef703b7cb59335eae2eb93ceb664c0eb7ea6bf567079d843e09420219668e072" "checksum scoped-tls 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "332ffa32bf586782a3efaeb58f127980944bbc8c4d6913a86107ac2a5ab24b28" -"checksum scopeguard 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "94258f53601af11e6a49f722422f6e3425c52b06245a5cf9bc09908b174f5e27" -"checksum scopeguard 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b42e15e59b18a828bbf5c58ea01debb36b9b096346de35d941dcb89009f24a0d" +"checksum scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" "checksum sdl2 0.32.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d051a07231e303f5f719da78cb6f7394f6d5b54f733aef5b0b447804a83edd7b" "checksum sdl2-sys 0.32.6 (registry+https://github.com/rust-lang/crates.io-index)" = "34e71125077d297d57e4c1acfe8981b5bdfbf5a20e7b589abfdcb33bf1127f86" "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" -"checksum serde 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)" = "d46b3dfedb19360a74316866cef04687cd4d6a70df8e6a506c63512790769b72" -"checksum serde_derive 1.0.97 (registry+https://github.com/rust-lang/crates.io-index)" = "c22a0820adfe2f257b098714323563dd06426502abbbce4f51b72ef544c5027f" -"checksum serde_json 1.0.40 (registry+https://github.com/rust-lang/crates.io-index)" = "051c49229f282f7c6f3813f8286cc1e3323e8051823fce42c7ea80fe13521704" -"checksum sha-1 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "23962131a91661d643c98940b20fcaffe62d776a823247be80a48fcb8b6fce68" -"checksum sha2 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7b4d8bfd0e469f417657573d8451fb33d16cfe0989359b93baf3a1ffc639543d" +"checksum serde 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "5317f7588f0a5078ee60ef675ef96735a1442132dc645eb1d12c018620ed8cd3" +"checksum serde_derive 1.0.114 (registry+https://github.com/rust-lang/crates.io-index)" = "2a0be94b04690fbaed37cddffc5c134bf537c8e3329d53e982fe04c374978f8e" +"checksum serde_json 1.0.56 (registry+https://github.com/rust-lang/crates.io-index)" = "3433e879a558dde8b5e8feb2a04899cf34fdde1fafb894687e52105fc1162ac3" +"checksum sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f7d94d0bede923b3cea61f3f1ff57ff8cdfd77b400fb8f9998949e0cf04163df" +"checksum sha2 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)" = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69" "checksum shannon 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7ea5b41c9427b56caa7b808cb548a04fb50bb5b9e98590b53f28064ff4174561" "checksum shell-words 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39acde55a154c4cd3ae048ac78cc21c25f3a0145e44111b523279113dce0d94a" "checksum shlex 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7fdf1b9db47230893d76faad238fd6097fd6d6a9245cd7a4d90dbd639536bbd2" -"checksum signal-hook 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "4f61c4d59f3aaa9f61bba6450a9b80ba48362fd7d651689e7a10c453b1f6dc68" -"checksum signal-hook-registry 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "913661ac8848a61e39684a3c3e7a7a14a4deec7f54b4976d0641e70dda3939b1" +"checksum signal-hook-registry 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "94f478ede9f64724c5d173d7bb56099ec3e2d9fc2774aac65d34b8b890405f41" "checksum slab 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b4fcaed89ab08ef143da37bc52adbcc04d4a69014f4c1208d6b51f0c47bc23" "checksum slab 0.4.2 (registry+https://github.com/rust-lang/crates.io-index)" = "c111b5bd5695e56cffe5129854aa230b39c93a305372fdbb2668ca2394eea9f8" "checksum smallvec 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4c8cbcd6df1e117c2210e13ab5109635ad68a929fcbb8964dc965b76cb5ee013" -"checksum smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab606a9c5e214920bb66c458cd7be8ef094f813f20fe77a54cc7dbfff220d4b7" -"checksum socket2 0.3.10 (registry+https://github.com/rust-lang/crates.io-index)" = "df028e0e632c2a1823d920ad74895e7f9128e6438cbc4bc6fd1f180e644767b9" -"checksum spin 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "44363f6f51401c34e7be73db0db371c04705d35efbe9f7d6082e03a921a32c55" -"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" +"checksum smallvec 0.6.13 (registry+https://github.com/rust-lang/crates.io-index)" = "f7b0758c52e15a8b5e3691eae6cc559f08eee9406e548a4477ba4e67770a82b6" +"checksum socket2 0.3.12 (registry+https://github.com/rust-lang/crates.io-index)" = "03088793f677dce356f3ccc2edb1b314ad191ab702a5de3faf49304f7e104918" "checksum stdweb 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ef5430c8e36b713e13b48a9f709cc21e046723fe44ce34587b73a830203b533e" -"checksum stream-cipher 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8861bc80f649f5b4c9bd38b696ae9af74499d479dbfb327f0607de6b326a36bc" +"checksum stream-cipher 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)" = "8131256a5896cabcf5eb04f4d6dacbe1aefda854b0d9896e09cb58829ec5638c" "checksum subtle 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee" -"checksum syn 0.15.42 (registry+https://github.com/rust-lang/crates.io-index)" = "eadc09306ca51a40555dd6fc2b415538e9e18bc9f870e47b1a524a79fe2dcf5e" -"checksum synstructure 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "02353edf96d6e4dc81aea2d8490a7e9db177bf8acb0e951c24940bf866cb313f" +"checksum syn 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" = "fb7f4c519df8c117855e19dd8cc851e89eb746fe7a73f0157e0d95fdec5369b0" "checksum take 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b157868d8ac1f56b64604539990685fa7611d8fa9e5476cf0c02cf34d32917c5" "checksum tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6e24d9338a0a5be79593e2fa15a648add6138caa803e2d5bc782c371732ca9" -"checksum termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)" = "96d6098003bde162e4277c70665bd87c326f5a0c3f3fbfb285787fa482d54e6e" -"checksum thread_local 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d40c6d1b69745a6ec6fb1ca717914848da4b44ae29d9b3080cbee91d72a69b14" -"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f" +"checksum termcolor 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bb6bfa289a4d7c5766392812c0a1f4c1ba45afa1ad47803c11e1f407d846d75f" +"checksum time 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)" = "ca8a50ef2360fbd1eeb0ecd46795a87a19024eb4b53c5dc916ca1fd95fe62438" +"checksum tinyvec 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" "checksum tokio 0.1.22 (registry+https://github.com/rust-lang/crates.io-index)" = "5a09c0b5bb588872ab2f09afa13ee6e9dac11e10a0ec9e8e3ba39a5a5d530af6" -"checksum tokio-codec 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5c501eceaf96f0e1793cf26beb63da3d11c738c4a943fdf3746d81d64684c39f" +"checksum tokio-codec 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "25b2998660ba0e70d18684de5d06b70b70a3a747469af9dea7618cc59e75976b" "checksum tokio-core 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "aeeffbbb94209023feaef3c196a41cbcdafa06b4a6f893f68779bb5e53796f71" -"checksum tokio-current-thread 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "d16217cad7f1b840c5a97dfb3c43b0c871fef423a6e8d2118c604e843662a443" -"checksum tokio-executor 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "0f27ee0e6db01c5f0b2973824547ce7e637b2ed79b891a9677b0de9bd532b6ac" -"checksum tokio-fs 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "3fe6dc22b08d6993916647d108a1a7d15b9cd29c4f4496c62b92c45b5041b7af" -"checksum tokio-io 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "5090db468dad16e1a7a54c8c67280c5e4b544f3d3e018f0b913b400261f85926" -"checksum tokio-process 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)" = "afbd6ef1b8cc2bd2c2b580d882774d443ebb1c6ceefe35ba9ea4ab586c89dbe8" +"checksum tokio-current-thread 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "b1de0e32a83f131e002238d7ccde18211c0a5397f60cbfffcb112868c2e0e20e" +"checksum tokio-executor 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "fb2d1b8f4548dbf5e1f7818512e9c406860678f29c300cdf0ebac72d1a3a1671" +"checksum tokio-fs 0.1.7 (registry+https://github.com/rust-lang/crates.io-index)" = "297a1206e0ca6302a0eed35b700d292b275256f596e2f3fea7729d5e629b6ff4" +"checksum tokio-io 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "57fc868aae093479e3131e3d165c93b1c7474109d13c90ec0dda2a1bbfff0674" +"checksum tokio-process 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "382d90f43fa31caebe5d3bc6cfd854963394fff3b8cb59d5146607aaae7e7e43" "checksum tokio-proto 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "8fbb47ae81353c63c487030659494b295f6cb6576242f907f203473b191b0389" -"checksum tokio-reactor 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "6af16bfac7e112bea8b0442542161bfc41cbfa4466b580bdda7d18cb88b911ce" +"checksum tokio-reactor 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)" = "09bc590ec4ba8ba87652da2068d150dcada2cfa2e07faae270a5e0409aa51351" "checksum tokio-service 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "24da22d077e0f15f55162bdbdc661228c1581892f52074fb242678d015b45162" -"checksum tokio-signal 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "dd6dc5276ea05ce379a16de90083ec80836440d5ef8a6a39545a3207373b8296" -"checksum tokio-sync 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "2162248ff317e2bc713b261f242b69dbb838b85248ed20bb21df56d60ea4cae7" -"checksum tokio-tcp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "1d14b10654be682ac43efee27401d792507e30fd8d26389e1da3b185de2e4119" -"checksum tokio-threadpool 0.1.15 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca01319dea1e376a001e8dc192d42ebde6dd532532a5bad988ac37db365b19" -"checksum tokio-timer 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)" = "f2106812d500ed25a4f38235b9cae8f78a09edf43203e16e59c3b769a342a60e" -"checksum tokio-udp 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "66268575b80f4a4a710ef83d087fdfeeabdce9b74c797535fbac18a2cb906e92" -"checksum tokio-uds 0.2.5 (registry+https://github.com/rust-lang/crates.io-index)" = "037ffc3ba0e12a0ab4aca92e5234e0dedeb48fddf6ccd260f1f150a36a9f2445" +"checksum tokio-signal 0.2.9 (registry+https://github.com/rust-lang/crates.io-index)" = "d0c34c6e548f101053321cba3da7cbb87a610b85555884c41b07da2eb91aff12" +"checksum tokio-sync 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "edfe50152bc8164fcc456dab7891fa9bf8beaf01c5ee7e1dd43a397c3cf87dee" +"checksum tokio-tcp 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "98df18ed66e3b72e742f185882a9e201892407957e45fbff8da17ae7a7c51f72" +"checksum tokio-threadpool 0.1.18 (registry+https://github.com/rust-lang/crates.io-index)" = "df720b6581784c118f0eb4310796b12b1d242a7eb95f716a8367855325c25f89" +"checksum tokio-timer 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "93044f2d313c95ff1cb7809ce9a7a05735b012288a888b62d4434fd58c94f296" +"checksum tokio-udp 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "e2a0b10e610b39c38b031a2fcab08e4b82f16ece36504988dcbd81dbba650d82" +"checksum tokio-uds 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "ab57a4ac4111c8c9dbcf70779f6fc8bc35ae4b2454809febac840ad19bd7e4e0" "checksum try-lock 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee2aa4715743892880f70885373966c83d73ef1b0838a664ef0c76fffd35e7c2" -"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169" -"checksum unicase 2.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a84e5511b2a947f3ae965dcb29b13b7b1691b6e7332cf5dbc1744138d5acb7f6" +"checksum typenum 1.12.0 (registry+https://github.com/rust-lang/crates.io-index)" = "373c8a200f9e67a0c95e62a4f52fbf80c23b4381c05a17845531982fa99e6b33" +"checksum unicase 2.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" "checksum unicode-bidi 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "49f2bd0c6468a8230e1db229cff8029217cf623c767ea5d60bfbd42729ea54d5" -"checksum unicode-normalization 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "141339a08b982d942be2ca06ff8b076563cbe223d1befd5450716790d44e2426" -"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526" -"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc" -"checksum unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "826e7639553986605ec5979c7dd957c7895e93eabed50ab2ffa7f6128a75097c" +"checksum unicode-normalization 0.1.13 (registry+https://github.com/rust-lang/crates.io-index)" = "6fb19cf769fa8c6a80a162df694621ebeb4dafb606470b2b2fce0be40a98a977" +"checksum unicode-width 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)" = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" +"checksum unicode-xid 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" "checksum url 1.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dd4e7c0d531266369519a4aa4f399d748bd37043b00bde1e4ff1f60a120b355a" "checksum uuid 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "90dbc611eb48397705a6b0f6e917da23ae517e4d127123d2cf7674206627d32a" -"checksum vergen 3.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "6aba5e34f93dc7051dfad05b98a18e9156f27e7b431fe1d2398cb6061c0a1dba" -"checksum version_check 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +"checksum vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" +"checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" "checksum vorbis 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "760993e54524128b88d4d7aff09c773c2f16a9f18db3c8ae1ccca5afd1287656" "checksum vorbis-encoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3fb66bcdde056dd230991bb86669a1269778fe8ad1f6cee403428ac7985391bc" "checksum vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "729e1f15395850b4e6d19ca0cd1d42ef44707503a53b69d40ff49182b3c5589d" +"checksum vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0a8d7034313748da1d84b0adfa501f83f9ec83250f37fbacfa92a3580327c4" "checksum vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1" "checksum want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" +"checksum wasi 0.9.0+wasi-snapshot-preview1 (registry+https://github.com/rust-lang/crates.io-index)" = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" "checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a" -"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770" +"checksum winapi 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" "checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc" "checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" -"checksum winapi-util 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7168bab6e1daee33b4557efd0e95d5ca70a03706d39fa5f3fe7a236f584b03c9" +"checksum winapi-util 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" "checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -"checksum wincolor 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "561ed901ae465d6185fa7864d63fbd5720d0ef718366c9a4dc83cf6170d7e9ba" "checksum ws2_32-sys 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e" From f83915e2124ef47d2c5e64bda6351ae78397b2b6 Mon Sep 17 00:00:00 2001 From: engineergreen Date: Wed, 22 Jul 2020 15:28:39 +0100 Subject: [PATCH 21/26] Issue #497 - Playing songs from android app (#501) * Issue #497 - Playing songs from android app Implement the fix suggested by @Johannesd3 * Fix formatting --- connect/src/spirc.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/connect/src/spirc.rs b/connect/src/spirc.rs index b4c657f7..0dd67093 100644 --- a/connect/src/spirc.rs +++ b/connect/src/spirc.rs @@ -790,7 +790,11 @@ impl SpircTask { } MessageType::kMessageTypeNotify => { - if self.device.get_is_active() && frame.get_device_state().get_is_active() { + if self.device.get_is_active() + && frame.get_device_state().get_is_active() + && self.device.get_became_active_at() + <= frame.get_device_state().get_became_active_at() + { self.device.set_is_active(false); self.state.set_status(PlayStatus::kPlayStatusStop); self.player.stop(); From 258db6ba42e807f72a3ee289d82cf6e244605435 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Wed, 22 Jul 2020 16:23:44 +0100 Subject: [PATCH 22/26] Downgrade vorbis lib due to upstream issue --- Cargo.lock | 35 ++++------------------------------- audio/Cargo.toml | 2 +- 2 files changed, 5 insertions(+), 32 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7d414ca0..54eb3789 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -787,7 +787,7 @@ dependencies = [ "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-traits 0.2.12 (registry+https://github.com/rust-lang/crates.io-index)", "tempfile 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "vorbis 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "vorbis 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -2115,40 +2115,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "vorbis" -version = "0.1.0" +version = "0.0.14" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.3.23 (registry+https://github.com/rust-lang/crates.io-index)", - "vorbis-encoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)", - "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", + "vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "vorbis-encoder" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", - "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", - "vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "vorbis-sys" -version = "0.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "gcc 0.3.55 (registry+https://github.com/rust-lang/crates.io-index)", - "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", - "ogg-sys 0.0.9 (registry+https://github.com/rust-lang/crates.io-index)", - "pkg-config 0.3.18 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "vorbis-sys" version = "0.1.0" @@ -2459,9 +2434,7 @@ dependencies = [ "checksum vergen 3.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4ce50d8996df1f85af15f2cd8d33daae6e479575123ef4314a51a70a230739cb" "checksum version_check 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)" = "b5a972e5669d67ba988ce3dc826706fb0a8b01471c088cb0b6110b805cc36aed" "checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" -"checksum vorbis 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "760993e54524128b88d4d7aff09c773c2f16a9f18db3c8ae1ccca5afd1287656" -"checksum vorbis-encoder 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "3fb66bcdde056dd230991bb86669a1269778fe8ad1f6cee403428ac7985391bc" -"checksum vorbis-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "729e1f15395850b4e6d19ca0cd1d42ef44707503a53b69d40ff49182b3c5589d" +"checksum vorbis 0.0.14 (registry+https://github.com/rust-lang/crates.io-index)" = "5e8a194457075360557b82dac78f7ca2d65bbb6679bccfabae5f7c8c706cc776" "checksum vorbis-sys 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3a0a8d7034313748da1d84b0adfa501f83f9ec83250f37fbacfa92a3580327c4" "checksum vorbisfile-sys 0.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "4f4306d7e1ac4699b55e20de9483750b90c250913188efd7484db6bfbe9042d1" "checksum want 0.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "a05d9d966753fa4b5c8db73fcab5eed4549cfe0e1e4e66911e5564a0085c35d1" diff --git a/audio/Cargo.toml b/audio/Cargo.toml index c9121562..c666ee78 100644 --- a/audio/Cargo.toml +++ b/audio/Cargo.toml @@ -23,7 +23,7 @@ tempfile = "3.1" aes-ctr = "0.3" librespot-tremor = { version = "0.1.0", optional = true } -vorbis = { version ="0.1.0", optional = true } +vorbis = { version ="0.0.14", optional = true } [features] with-tremor = ["librespot-tremor"] From 74ad7231ba3190ec2c93003be307363dce02b3fd Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Wed, 22 Jul 2020 16:35:05 +0100 Subject: [PATCH 23/26] Run rustfmt, rust version 1.45.0 --- protocol/src/authentication.rs | 1874 ++++++++++----- protocol/src/keyexchange.rs | 2422 ++++++++++++------- protocol/src/mercury.rs | 646 +++-- protocol/src/metadata.rs | 3852 +++++++++++++++++++----------- protocol/src/playlist4changes.rs | 1444 +++++++---- protocol/src/playlist4content.rs | 575 +++-- protocol/src/playlist4issues.rs | 232 +- protocol/src/playlist4meta.rs | 734 ++++-- protocol/src/playlist4ops.rs | 1421 +++++++---- protocol/src/pubsub.rs | 94 +- protocol/src/spirc.rs | 1526 +++++++----- 11 files changed, 9487 insertions(+), 5333 deletions(-) diff --git a/protocol/src/authentication.rs b/protocol/src/authentication.rs index 2dc30125..49a0fc22 100644 --- a/protocol/src/authentication.rs +++ b/protocol/src/authentication.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientResponseEncrypted { // message fields login_credentials: ::protobuf::SingularPtrField, @@ -56,9 +56,10 @@ impl ClientResponseEncrypted { // required .LoginCredentials login_credentials = 10; - pub fn get_login_credentials(&self) -> &LoginCredentials { - self.login_credentials.as_ref().unwrap_or_else(|| LoginCredentials::default_instance()) + self.login_credentials + .as_ref() + .unwrap_or_else(|| LoginCredentials::default_instance()) } pub fn clear_login_credentials(&mut self) { self.login_credentials.clear(); @@ -84,14 +85,16 @@ impl ClientResponseEncrypted { // Take field pub fn take_login_credentials(&mut self) -> LoginCredentials { - self.login_credentials.take().unwrap_or_else(|| LoginCredentials::new()) + self.login_credentials + .take() + .unwrap_or_else(|| LoginCredentials::new()) } // optional .AccountCreation account_creation = 20; - pub fn get_account_creation(&self) -> AccountCreation { - self.account_creation.unwrap_or(AccountCreation::ACCOUNT_CREATION_ALWAYS_PROMPT) + self.account_creation + .unwrap_or(AccountCreation::ACCOUNT_CREATION_ALWAYS_PROMPT) } pub fn clear_account_creation(&mut self) { self.account_creation = ::std::option::Option::None; @@ -108,9 +111,10 @@ impl ClientResponseEncrypted { // optional .FingerprintResponseUnion fingerprint_response = 30; - pub fn get_fingerprint_response(&self) -> &FingerprintResponseUnion { - self.fingerprint_response.as_ref().unwrap_or_else(|| FingerprintResponseUnion::default_instance()) + self.fingerprint_response + .as_ref() + .unwrap_or_else(|| FingerprintResponseUnion::default_instance()) } pub fn clear_fingerprint_response(&mut self) { self.fingerprint_response.clear(); @@ -136,14 +140,17 @@ impl ClientResponseEncrypted { // Take field pub fn take_fingerprint_response(&mut self) -> FingerprintResponseUnion { - self.fingerprint_response.take().unwrap_or_else(|| FingerprintResponseUnion::new()) + self.fingerprint_response + .take() + .unwrap_or_else(|| FingerprintResponseUnion::new()) } // optional .PeerTicketUnion peer_ticket = 40; - pub fn get_peer_ticket(&self) -> &PeerTicketUnion { - self.peer_ticket.as_ref().unwrap_or_else(|| PeerTicketUnion::default_instance()) + self.peer_ticket + .as_ref() + .unwrap_or_else(|| PeerTicketUnion::default_instance()) } pub fn clear_peer_ticket(&mut self) { self.peer_ticket.clear(); @@ -169,14 +176,17 @@ impl ClientResponseEncrypted { // Take field pub fn take_peer_ticket(&mut self) -> PeerTicketUnion { - self.peer_ticket.take().unwrap_or_else(|| PeerTicketUnion::new()) + self.peer_ticket + .take() + .unwrap_or_else(|| PeerTicketUnion::new()) } // required .SystemInfo system_info = 50; - pub fn get_system_info(&self) -> &SystemInfo { - self.system_info.as_ref().unwrap_or_else(|| SystemInfo::default_instance()) + self.system_info + .as_ref() + .unwrap_or_else(|| SystemInfo::default_instance()) } pub fn clear_system_info(&mut self) { self.system_info.clear(); @@ -207,7 +217,6 @@ impl ClientResponseEncrypted { // optional string platform_model = 60; - pub fn get_platform_model(&self) -> &str { match self.platform_model.as_ref() { Some(v) => &v, @@ -238,12 +247,13 @@ impl ClientResponseEncrypted { // Take field pub fn take_platform_model(&mut self) -> ::std::string::String { - self.platform_model.take().unwrap_or_else(|| ::std::string::String::new()) + self.platform_model + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string version_string = 70; - pub fn get_version_string(&self) -> &str { match self.version_string.as_ref() { Some(v) => &v, @@ -274,14 +284,17 @@ impl ClientResponseEncrypted { // Take field pub fn take_version_string(&mut self) -> ::std::string::String { - self.version_string.take().unwrap_or_else(|| ::std::string::String::new()) + self.version_string + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .LibspotifyAppKey appkey = 80; - pub fn get_appkey(&self) -> &LibspotifyAppKey { - self.appkey.as_ref().unwrap_or_else(|| LibspotifyAppKey::default_instance()) + self.appkey + .as_ref() + .unwrap_or_else(|| LibspotifyAppKey::default_instance()) } pub fn clear_appkey(&mut self) { self.appkey.clear(); @@ -307,14 +320,17 @@ impl ClientResponseEncrypted { // Take field pub fn take_appkey(&mut self) -> LibspotifyAppKey { - self.appkey.take().unwrap_or_else(|| LibspotifyAppKey::new()) + self.appkey + .take() + .unwrap_or_else(|| LibspotifyAppKey::new()) } // optional .ClientInfo client_info = 90; - pub fn get_client_info(&self) -> &ClientInfo { - self.client_info.as_ref().unwrap_or_else(|| ClientInfo::default_instance()) + self.client_info + .as_ref() + .unwrap_or_else(|| ClientInfo::default_instance()) } pub fn clear_client_info(&mut self) { self.client_info.clear(); @@ -356,69 +372,109 @@ impl ::protobuf::Message for ClientResponseEncrypted { if !v.is_initialized() { return false; } - }; + } for v in &self.fingerprint_response { if !v.is_initialized() { return false; } - }; + } for v in &self.peer_ticket { if !v.is_initialized() { return false; } - }; + } for v in &self.system_info { if !v.is_initialized() { return false; } - }; + } for v in &self.appkey { if !v.is_initialized() { return false; } - }; + } for v in &self.client_info { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.login_credentials)?; - }, - 20 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.account_creation, 20, &mut self.unknown_fields)? - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.login_credentials, + )?; + } + 20 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.account_creation, + 20, + &mut self.unknown_fields, + )?, 30 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.fingerprint_response)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.fingerprint_response, + )?; + } 40 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.peer_ticket)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.peer_ticket, + )?; + } 50 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.system_info)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.system_info, + )?; + } 60 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.platform_model)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.platform_model, + )?; + } 70 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.version_string)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.version_string, + )?; + } 80 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.appkey)?; - }, + } 90 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.client_info)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.client_info, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -466,7 +522,10 @@ impl ::protobuf::Message for ClientResponseEncrypted { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.login_credentials.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -541,69 +600,112 @@ impl ::protobuf::Message for ClientResponseEncrypted { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "login_credentials", - |m: &ClientResponseEncrypted| { &m.login_credentials }, - |m: &mut ClientResponseEncrypted| { &mut m.login_credentials }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "login_credentials", + |m: &ClientResponseEncrypted| &m.login_credentials, + |m: &mut ClientResponseEncrypted| &mut m.login_credentials, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "account_creation", - |m: &ClientResponseEncrypted| { &m.account_creation }, - |m: &mut ClientResponseEncrypted| { &mut m.account_creation }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "fingerprint_response", - |m: &ClientResponseEncrypted| { &m.fingerprint_response }, - |m: &mut ClientResponseEncrypted| { &mut m.fingerprint_response }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "peer_ticket", - |m: &ClientResponseEncrypted| { &m.peer_ticket }, - |m: &mut ClientResponseEncrypted| { &mut m.peer_ticket }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "system_info", - |m: &ClientResponseEncrypted| { &m.system_info }, - |m: &mut ClientResponseEncrypted| { &mut m.system_info }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "platform_model", - |m: &ClientResponseEncrypted| { &m.platform_model }, - |m: &mut ClientResponseEncrypted| { &mut m.platform_model }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "version_string", - |m: &ClientResponseEncrypted| { &m.version_string }, - |m: &mut ClientResponseEncrypted| { &mut m.version_string }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "appkey", - |m: &ClientResponseEncrypted| { &m.appkey }, - |m: &mut ClientResponseEncrypted| { &mut m.appkey }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "client_info", - |m: &ClientResponseEncrypted| { &m.client_info }, - |m: &mut ClientResponseEncrypted| { &mut m.client_info }, + |m: &ClientResponseEncrypted| &m.account_creation, + |m: &mut ClientResponseEncrypted| &mut m.account_creation, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "fingerprint_response", + |m: &ClientResponseEncrypted| &m.fingerprint_response, + |m: &mut ClientResponseEncrypted| &mut m.fingerprint_response, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "peer_ticket", + |m: &ClientResponseEncrypted| &m.peer_ticket, + |m: &mut ClientResponseEncrypted| &mut m.peer_ticket, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "system_info", + |m: &ClientResponseEncrypted| &m.system_info, + |m: &mut ClientResponseEncrypted| &mut m.system_info, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "platform_model", + |m: &ClientResponseEncrypted| &m.platform_model, + |m: &mut ClientResponseEncrypted| &mut m.platform_model, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "version_string", + |m: &ClientResponseEncrypted| &m.version_string, + |m: &mut ClientResponseEncrypted| &mut m.version_string, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "appkey", + |m: &ClientResponseEncrypted| &m.appkey, + |m: &mut ClientResponseEncrypted| &mut m.appkey, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "client_info", + |m: &ClientResponseEncrypted| &m.client_info, + |m: &mut ClientResponseEncrypted| &mut m.client_info, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientResponseEncrypted", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ClientResponseEncrypted { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientResponseEncrypted::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ClientResponseEncrypted::new) } } } @@ -634,7 +736,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientResponseEncrypted { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCredentials { // message fields username: ::protobuf::SingularField<::std::string::String>, @@ -658,7 +760,6 @@ impl LoginCredentials { // optional string username = 10; - pub fn get_username(&self) -> &str { match self.username.as_ref() { Some(v) => &v, @@ -689,14 +790,16 @@ impl LoginCredentials { // Take field pub fn take_username(&mut self) -> ::std::string::String { - self.username.take().unwrap_or_else(|| ::std::string::String::new()) + self.username + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // required .AuthenticationType typ = 20; - pub fn get_typ(&self) -> AuthenticationType { - self.typ.unwrap_or(AuthenticationType::AUTHENTICATION_USER_PASS) + self.typ + .unwrap_or(AuthenticationType::AUTHENTICATION_USER_PASS) } pub fn clear_typ(&mut self) { self.typ = ::std::option::Option::None; @@ -713,7 +816,6 @@ impl LoginCredentials { // optional bytes auth_data = 30; - pub fn get_auth_data(&self) -> &[u8] { match self.auth_data.as_ref() { Some(v) => &v, @@ -744,7 +846,9 @@ impl LoginCredentials { // Take field pub fn take_auth_data(&mut self) -> ::std::vec::Vec { - self.auth_data.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.auth_data + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -756,22 +860,34 @@ impl ::protobuf::Message for LoginCredentials { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.username)?; - }, - 20 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.typ, 20, &mut self.unknown_fields)? - }, + } + 20 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.typ, + 20, + &mut self.unknown_fields, + )?, 30 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.auth_data)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -795,7 +911,10 @@ impl ::protobuf::Message for LoginCredentials { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.username.as_ref() { os.write_string(10, &v)?; } @@ -840,39 +959,52 @@ impl ::protobuf::Message for LoginCredentials { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "username", - |m: &LoginCredentials| { &m.username }, - |m: &mut LoginCredentials| { &mut m.username }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "username", + |m: &LoginCredentials| &m.username, + |m: &mut LoginCredentials| &mut m.username, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "typ", - |m: &LoginCredentials| { &m.typ }, - |m: &mut LoginCredentials| { &mut m.typ }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "auth_data", - |m: &LoginCredentials| { &m.auth_data }, - |m: &mut LoginCredentials| { &mut m.auth_data }, + |m: &LoginCredentials| &m.typ, + |m: &mut LoginCredentials| &mut m.typ, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "auth_data", + |m: &LoginCredentials| &m.auth_data, + |m: &mut LoginCredentials| &mut m.auth_data, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCredentials", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LoginCredentials { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCredentials::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCredentials::new) } } } @@ -897,7 +1029,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCredentials { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FingerprintResponseUnion { // message fields grain: ::protobuf::SingularPtrField, @@ -920,9 +1052,10 @@ impl FingerprintResponseUnion { // optional .FingerprintGrainResponse grain = 10; - pub fn get_grain(&self) -> &FingerprintGrainResponse { - self.grain.as_ref().unwrap_or_else(|| FingerprintGrainResponse::default_instance()) + self.grain + .as_ref() + .unwrap_or_else(|| FingerprintGrainResponse::default_instance()) } pub fn clear_grain(&mut self) { self.grain.clear(); @@ -948,14 +1081,17 @@ impl FingerprintResponseUnion { // Take field pub fn take_grain(&mut self) -> FingerprintGrainResponse { - self.grain.take().unwrap_or_else(|| FingerprintGrainResponse::new()) + self.grain + .take() + .unwrap_or_else(|| FingerprintGrainResponse::new()) } // optional .FingerprintHmacRipemdResponse hmac_ripemd = 20; - pub fn get_hmac_ripemd(&self) -> &FingerprintHmacRipemdResponse { - self.hmac_ripemd.as_ref().unwrap_or_else(|| FingerprintHmacRipemdResponse::default_instance()) + self.hmac_ripemd + .as_ref() + .unwrap_or_else(|| FingerprintHmacRipemdResponse::default_instance()) } pub fn clear_hmac_ripemd(&mut self) { self.hmac_ripemd.clear(); @@ -981,7 +1117,9 @@ impl FingerprintResponseUnion { // Take field pub fn take_hmac_ripemd(&mut self) -> FingerprintHmacRipemdResponse { - self.hmac_ripemd.take().unwrap_or_else(|| FingerprintHmacRipemdResponse::new()) + self.hmac_ripemd + .take() + .unwrap_or_else(|| FingerprintHmacRipemdResponse::new()) } } @@ -991,28 +1129,40 @@ impl ::protobuf::Message for FingerprintResponseUnion { if !v.is_initialized() { return false; } - }; + } for v in &self.hmac_ripemd { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.grain)?; - }, + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.hmac_ripemd)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.hmac_ripemd, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1035,7 +1185,10 @@ impl ::protobuf::Message for FingerprintResponseUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.grain.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -1081,34 +1234,44 @@ impl ::protobuf::Message for FingerprintResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "grain", - |m: &FingerprintResponseUnion| { &m.grain }, - |m: &mut FingerprintResponseUnion| { &mut m.grain }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "hmac_ripemd", - |m: &FingerprintResponseUnion| { &m.hmac_ripemd }, - |m: &mut FingerprintResponseUnion| { &mut m.hmac_ripemd }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "grain", + |m: &FingerprintResponseUnion| &m.grain, + |m: &mut FingerprintResponseUnion| &mut m.grain, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "hmac_ripemd", + |m: &FingerprintResponseUnion| &m.hmac_ripemd, + |m: &mut FingerprintResponseUnion| &mut m.hmac_ripemd, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintResponseUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static FingerprintResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FingerprintResponseUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(FingerprintResponseUnion::new) } } } @@ -1132,7 +1295,7 @@ impl ::protobuf::reflect::ProtobufValue for FingerprintResponseUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FingerprintGrainResponse { // message fields encrypted_key: ::protobuf::SingularField<::std::vec::Vec>, @@ -1154,7 +1317,6 @@ impl FingerprintGrainResponse { // required bytes encrypted_key = 10; - pub fn get_encrypted_key(&self) -> &[u8] { match self.encrypted_key.as_ref() { Some(v) => &v, @@ -1185,7 +1347,9 @@ impl FingerprintGrainResponse { // Take field pub fn take_encrypted_key(&mut self) -> ::std::vec::Vec { - self.encrypted_key.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.encrypted_key + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -1197,16 +1361,28 @@ impl ::protobuf::Message for FingerprintGrainResponse { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.encrypted_key)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.encrypted_key, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1224,7 +1400,10 @@ impl ::protobuf::Message for FingerprintGrainResponse { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.encrypted_key.as_ref() { os.write_bytes(10, &v)?; } @@ -1263,29 +1442,34 @@ impl ::protobuf::Message for FingerprintGrainResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "encrypted_key", - |m: &FingerprintGrainResponse| { &m.encrypted_key }, - |m: &mut FingerprintGrainResponse| { &mut m.encrypted_key }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "encrypted_key", + |m: &FingerprintGrainResponse| &m.encrypted_key, + |m: &mut FingerprintGrainResponse| &mut m.encrypted_key, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintGrainResponse", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static FingerprintGrainResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FingerprintGrainResponse::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(FingerprintGrainResponse::new) } } } @@ -1308,7 +1492,7 @@ impl ::protobuf::reflect::ProtobufValue for FingerprintGrainResponse { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FingerprintHmacRipemdResponse { // message fields hmac: ::protobuf::SingularField<::std::vec::Vec>, @@ -1330,7 +1514,6 @@ impl FingerprintHmacRipemdResponse { // required bytes hmac = 10; - pub fn get_hmac(&self) -> &[u8] { match self.hmac.as_ref() { Some(v) => &v, @@ -1373,16 +1556,24 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.hmac)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1400,7 +1591,10 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.hmac.as_ref() { os.write_bytes(10, &v)?; } @@ -1439,7 +1633,8 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1458,10 +1653,9 @@ impl ::protobuf::Message for FingerprintHmacRipemdResponse { } fn default_instance() -> &'static FingerprintHmacRipemdResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FingerprintHmacRipemdResponse::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(FingerprintHmacRipemdResponse::new) } } } @@ -1484,7 +1678,7 @@ impl ::protobuf::reflect::ProtobufValue for FingerprintHmacRipemdResponse { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PeerTicketUnion { // message fields public_key: ::protobuf::SingularPtrField, @@ -1507,9 +1701,10 @@ impl PeerTicketUnion { // optional .PeerTicketPublicKey public_key = 10; - pub fn get_public_key(&self) -> &PeerTicketPublicKey { - self.public_key.as_ref().unwrap_or_else(|| PeerTicketPublicKey::default_instance()) + self.public_key + .as_ref() + .unwrap_or_else(|| PeerTicketPublicKey::default_instance()) } pub fn clear_public_key(&mut self) { self.public_key.clear(); @@ -1535,14 +1730,17 @@ impl PeerTicketUnion { // Take field pub fn take_public_key(&mut self) -> PeerTicketPublicKey { - self.public_key.take().unwrap_or_else(|| PeerTicketPublicKey::new()) + self.public_key + .take() + .unwrap_or_else(|| PeerTicketPublicKey::new()) } // optional .PeerTicketOld old_ticket = 20; - pub fn get_old_ticket(&self) -> &PeerTicketOld { - self.old_ticket.as_ref().unwrap_or_else(|| PeerTicketOld::default_instance()) + self.old_ticket + .as_ref() + .unwrap_or_else(|| PeerTicketOld::default_instance()) } pub fn clear_old_ticket(&mut self) { self.old_ticket.clear(); @@ -1568,7 +1766,9 @@ impl PeerTicketUnion { // Take field pub fn take_old_ticket(&mut self) -> PeerTicketOld { - self.old_ticket.take().unwrap_or_else(|| PeerTicketOld::new()) + self.old_ticket + .take() + .unwrap_or_else(|| PeerTicketOld::new()) } } @@ -1578,28 +1778,44 @@ impl ::protobuf::Message for PeerTicketUnion { if !v.is_initialized() { return false; } - }; + } for v in &self.old_ticket { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.public_key)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.public_key, + )?; + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.old_ticket)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.old_ticket, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1622,7 +1838,10 @@ impl ::protobuf::Message for PeerTicketUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.public_key.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -1668,24 +1887,35 @@ impl ::protobuf::Message for PeerTicketUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "public_key", - |m: &PeerTicketUnion| { &m.public_key }, - |m: &mut PeerTicketUnion| { &mut m.public_key }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "old_ticket", - |m: &PeerTicketUnion| { &m.old_ticket }, - |m: &mut PeerTicketUnion| { &mut m.old_ticket }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "public_key", + |m: &PeerTicketUnion| &m.public_key, + |m: &mut PeerTicketUnion| &mut m.public_key, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "old_ticket", + |m: &PeerTicketUnion| &m.old_ticket, + |m: &mut PeerTicketUnion| &mut m.old_ticket, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PeerTicketUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1693,9 +1923,7 @@ impl ::protobuf::Message for PeerTicketUnion { fn default_instance() -> &'static PeerTicketUnion { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PeerTicketUnion::new) - } + unsafe { instance.get(PeerTicketUnion::new) } } } @@ -1719,7 +1947,7 @@ impl ::protobuf::reflect::ProtobufValue for PeerTicketUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PeerTicketPublicKey { // message fields public_key: ::protobuf::SingularField<::std::vec::Vec>, @@ -1741,7 +1969,6 @@ impl PeerTicketPublicKey { // required bytes public_key = 10; - pub fn get_public_key(&self) -> &[u8] { match self.public_key.as_ref() { Some(v) => &v, @@ -1772,7 +1999,9 @@ impl PeerTicketPublicKey { // Take field pub fn take_public_key(&mut self) -> ::std::vec::Vec { - self.public_key.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.public_key + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -1784,16 +2013,24 @@ impl ::protobuf::Message for PeerTicketPublicKey { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.public_key)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1811,7 +2048,10 @@ impl ::protobuf::Message for PeerTicketPublicKey { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.public_key.as_ref() { os.write_bytes(10, &v)?; } @@ -1850,29 +2090,34 @@ impl ::protobuf::Message for PeerTicketPublicKey { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "public_key", - |m: &PeerTicketPublicKey| { &m.public_key }, - |m: &mut PeerTicketPublicKey| { &mut m.public_key }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "public_key", + |m: &PeerTicketPublicKey| &m.public_key, + |m: &mut PeerTicketPublicKey| &mut m.public_key, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PeerTicketPublicKey", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static PeerTicketPublicKey { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PeerTicketPublicKey::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(PeerTicketPublicKey::new) } } } @@ -1895,7 +2140,7 @@ impl ::protobuf::reflect::ProtobufValue for PeerTicketPublicKey { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PeerTicketOld { // message fields peer_ticket: ::protobuf::SingularField<::std::vec::Vec>, @@ -1918,7 +2163,6 @@ impl PeerTicketOld { // required bytes peer_ticket = 10; - pub fn get_peer_ticket(&self) -> &[u8] { match self.peer_ticket.as_ref() { Some(v) => &v, @@ -1949,12 +2193,13 @@ impl PeerTicketOld { // Take field pub fn take_peer_ticket(&mut self) -> ::std::vec::Vec { - self.peer_ticket.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.peer_ticket + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // required bytes peer_ticket_signature = 20; - pub fn get_peer_ticket_signature(&self) -> &[u8] { match self.peer_ticket_signature.as_ref() { Some(v) => &v, @@ -1985,7 +2230,9 @@ impl PeerTicketOld { // Take field pub fn take_peer_ticket_signature(&mut self) -> ::std::vec::Vec { - self.peer_ticket_signature.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.peer_ticket_signature + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -2000,19 +2247,31 @@ impl ::protobuf::Message for PeerTicketOld { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.peer_ticket)?; - }, + } 20 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.peer_ticket_signature)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.peer_ticket_signature, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2033,7 +2292,10 @@ impl ::protobuf::Message for PeerTicketOld { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.peer_ticket.as_ref() { os.write_bytes(10, &v)?; } @@ -2075,24 +2337,35 @@ impl ::protobuf::Message for PeerTicketOld { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "peer_ticket", - |m: &PeerTicketOld| { &m.peer_ticket }, - |m: &mut PeerTicketOld| { &mut m.peer_ticket }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "peer_ticket_signature", - |m: &PeerTicketOld| { &m.peer_ticket_signature }, - |m: &mut PeerTicketOld| { &mut m.peer_ticket_signature }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "peer_ticket", + |m: &PeerTicketOld| &m.peer_ticket, + |m: &mut PeerTicketOld| &mut m.peer_ticket, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "peer_ticket_signature", + |m: &PeerTicketOld| &m.peer_ticket_signature, + |m: &mut PeerTicketOld| &mut m.peer_ticket_signature, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PeerTicketOld", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2100,9 +2373,7 @@ impl ::protobuf::Message for PeerTicketOld { fn default_instance() -> &'static PeerTicketOld { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PeerTicketOld::new) - } + unsafe { instance.get(PeerTicketOld::new) } } } @@ -2126,7 +2397,7 @@ impl ::protobuf::reflect::ProtobufValue for PeerTicketOld { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct SystemInfo { // message fields cpu_family: ::std::option::Option, @@ -2157,7 +2428,6 @@ impl SystemInfo { // required .CpuFamily cpu_family = 10; - pub fn get_cpu_family(&self) -> CpuFamily { self.cpu_family.unwrap_or(CpuFamily::CPU_UNKNOWN) } @@ -2176,7 +2446,6 @@ impl SystemInfo { // optional uint32 cpu_subtype = 20; - pub fn get_cpu_subtype(&self) -> u32 { self.cpu_subtype.unwrap_or(0) } @@ -2195,7 +2464,6 @@ impl SystemInfo { // optional uint32 cpu_ext = 30; - pub fn get_cpu_ext(&self) -> u32 { self.cpu_ext.unwrap_or(0) } @@ -2214,7 +2482,6 @@ impl SystemInfo { // optional .Brand brand = 40; - pub fn get_brand(&self) -> Brand { self.brand.unwrap_or(Brand::BRAND_UNBRANDED) } @@ -2233,7 +2500,6 @@ impl SystemInfo { // optional uint32 brand_flags = 50; - pub fn get_brand_flags(&self) -> u32 { self.brand_flags.unwrap_or(0) } @@ -2252,7 +2518,6 @@ impl SystemInfo { // required .Os os = 60; - pub fn get_os(&self) -> Os { self.os.unwrap_or(Os::OS_UNKNOWN) } @@ -2271,7 +2536,6 @@ impl SystemInfo { // optional uint32 os_version = 70; - pub fn get_os_version(&self) -> u32 { self.os_version.unwrap_or(0) } @@ -2290,7 +2554,6 @@ impl SystemInfo { // optional uint32 os_ext = 80; - pub fn get_os_ext(&self) -> u32 { self.os_ext.unwrap_or(0) } @@ -2309,7 +2572,6 @@ impl SystemInfo { // optional string system_information_string = 90; - pub fn get_system_information_string(&self) -> &str { match self.system_information_string.as_ref() { Some(v) => &v, @@ -2340,12 +2602,13 @@ impl SystemInfo { // Take field pub fn take_system_information_string(&mut self) -> ::std::string::String { - self.system_information_string.take().unwrap_or_else(|| ::std::string::String::new()) + self.system_information_string + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string device_id = 100; - pub fn get_device_id(&self) -> &str { match self.device_id.as_ref() { Some(v) => &v, @@ -2376,7 +2639,9 @@ impl SystemInfo { // Take field pub fn take_device_id(&mut self) -> ::std::string::String { - self.device_id.take().unwrap_or_else(|| ::std::string::String::new()) + self.device_id + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -2391,63 +2656,97 @@ impl ::protobuf::Message for SystemInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 10 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.cpu_family, 10, &mut self.unknown_fields)? - }, + 10 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.cpu_family, + 10, + &mut self.unknown_fields, + )?, 20 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.cpu_subtype = ::std::option::Option::Some(tmp); - }, + } 30 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.cpu_ext = ::std::option::Option::Some(tmp); - }, - 40 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.brand, 40, &mut self.unknown_fields)? - }, + } + 40 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.brand, + 40, + &mut self.unknown_fields, + )?, 50 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.brand_flags = ::std::option::Option::Some(tmp); - }, - 60 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.os, 60, &mut self.unknown_fields)? - }, + } + 60 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.os, + 60, + &mut self.unknown_fields, + )?, 70 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.os_version = ::std::option::Option::Some(tmp); - }, + } 80 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.os_ext = ::std::option::Option::Some(tmp); - }, + } 90 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.system_information_string)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.system_information_string, + )?; + } 100 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.device_id)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2492,7 +2791,10 @@ impl ::protobuf::Message for SystemInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.cpu_family { os.write_enum(10, v.value())?; } @@ -2558,64 +2860,99 @@ impl ::protobuf::Message for SystemInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "cpu_family", - |m: &SystemInfo| { &m.cpu_family }, - |m: &mut SystemInfo| { &mut m.cpu_family }, + |m: &SystemInfo| &m.cpu_family, + |m: &mut SystemInfo| &mut m.cpu_family, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "cpu_subtype", - |m: &SystemInfo| { &m.cpu_subtype }, - |m: &mut SystemInfo| { &mut m.cpu_subtype }, + |m: &SystemInfo| &m.cpu_subtype, + |m: &mut SystemInfo| &mut m.cpu_subtype, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "cpu_ext", - |m: &SystemInfo| { &m.cpu_ext }, - |m: &mut SystemInfo| { &mut m.cpu_ext }, + |m: &SystemInfo| &m.cpu_ext, + |m: &mut SystemInfo| &mut m.cpu_ext, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "brand", - |m: &SystemInfo| { &m.brand }, - |m: &mut SystemInfo| { &mut m.brand }, + |m: &SystemInfo| &m.brand, + |m: &mut SystemInfo| &mut m.brand, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "brand_flags", - |m: &SystemInfo| { &m.brand_flags }, - |m: &mut SystemInfo| { &mut m.brand_flags }, + |m: &SystemInfo| &m.brand_flags, + |m: &mut SystemInfo| &mut m.brand_flags, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "os", - |m: &SystemInfo| { &m.os }, - |m: &mut SystemInfo| { &mut m.os }, + |m: &SystemInfo| &m.os, + |m: &mut SystemInfo| &mut m.os, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "os_version", - |m: &SystemInfo| { &m.os_version }, - |m: &mut SystemInfo| { &mut m.os_version }, + |m: &SystemInfo| &m.os_version, + |m: &mut SystemInfo| &mut m.os_version, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "os_ext", - |m: &SystemInfo| { &m.os_ext }, - |m: &mut SystemInfo| { &mut m.os_ext }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "system_information_string", - |m: &SystemInfo| { &m.system_information_string }, - |m: &mut SystemInfo| { &mut m.system_information_string }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "device_id", - |m: &SystemInfo| { &m.device_id }, - |m: &mut SystemInfo| { &mut m.device_id }, + |m: &SystemInfo| &m.os_ext, + |m: &mut SystemInfo| &mut m.os_ext, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "system_information_string", + |m: &SystemInfo| &m.system_information_string, + |m: &mut SystemInfo| &mut m.system_information_string, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "device_id", + |m: &SystemInfo| &m.device_id, + |m: &mut SystemInfo| &mut m.device_id, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "SystemInfo", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2623,9 +2960,7 @@ impl ::protobuf::Message for SystemInfo { fn default_instance() -> &'static SystemInfo { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(SystemInfo::new) - } + unsafe { instance.get(SystemInfo::new) } } } @@ -2657,7 +2992,7 @@ impl ::protobuf::reflect::ProtobufValue for SystemInfo { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LibspotifyAppKey { // message fields version: ::std::option::Option, @@ -2683,7 +3018,6 @@ impl LibspotifyAppKey { // required uint32 version = 1; - pub fn get_version(&self) -> u32 { self.version.unwrap_or(0) } @@ -2702,7 +3036,6 @@ impl LibspotifyAppKey { // required bytes devkey = 2; - pub fn get_devkey(&self) -> &[u8] { match self.devkey.as_ref() { Some(v) => &v, @@ -2738,7 +3071,6 @@ impl LibspotifyAppKey { // required bytes signature = 3; - pub fn get_signature(&self) -> &[u8] { match self.signature.as_ref() { Some(v) => &v, @@ -2769,12 +3101,13 @@ impl LibspotifyAppKey { // Take field pub fn take_signature(&mut self) -> ::std::vec::Vec { - self.signature.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.signature + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // required string useragent = 4; - pub fn get_useragent(&self) -> &str { match self.useragent.as_ref() { Some(v) => &v, @@ -2805,12 +3138,13 @@ impl LibspotifyAppKey { // Take field pub fn take_useragent(&mut self) -> ::std::string::String { - self.useragent.take().unwrap_or_else(|| ::std::string::String::new()) + self.useragent + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // required bytes callback_hash = 5; - pub fn get_callback_hash(&self) -> &[u8] { match self.callback_hash.as_ref() { Some(v) => &v, @@ -2841,7 +3175,9 @@ impl LibspotifyAppKey { // Take field pub fn take_callback_hash(&mut self) -> ::std::vec::Vec { - self.callback_hash.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.callback_hash + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -2865,32 +3201,46 @@ impl ::protobuf::Message for LibspotifyAppKey { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.version = ::std::option::Option::Some(tmp); - }, + } 2 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.devkey)?; - }, + } 3 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.signature)?; - }, + } 4 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.useragent)?; - }, + } 5 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.callback_hash)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.callback_hash, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2920,7 +3270,10 @@ impl ::protobuf::Message for LibspotifyAppKey { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.version { os.write_uint32(1, v)?; } @@ -2971,49 +3324,72 @@ impl ::protobuf::Message for LibspotifyAppKey { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "version", - |m: &LibspotifyAppKey| { &m.version }, - |m: &mut LibspotifyAppKey| { &mut m.version }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "devkey", - |m: &LibspotifyAppKey| { &m.devkey }, - |m: &mut LibspotifyAppKey| { &mut m.devkey }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "signature", - |m: &LibspotifyAppKey| { &m.signature }, - |m: &mut LibspotifyAppKey| { &mut m.signature }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "useragent", - |m: &LibspotifyAppKey| { &m.useragent }, - |m: &mut LibspotifyAppKey| { &mut m.useragent }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "callback_hash", - |m: &LibspotifyAppKey| { &m.callback_hash }, - |m: &mut LibspotifyAppKey| { &mut m.callback_hash }, + |m: &LibspotifyAppKey| &m.version, + |m: &mut LibspotifyAppKey| &mut m.version, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "devkey", + |m: &LibspotifyAppKey| &m.devkey, + |m: &mut LibspotifyAppKey| &mut m.devkey, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "signature", + |m: &LibspotifyAppKey| &m.signature, + |m: &mut LibspotifyAppKey| &mut m.signature, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "useragent", + |m: &LibspotifyAppKey| &m.useragent, + |m: &mut LibspotifyAppKey| &mut m.useragent, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "callback_hash", + |m: &LibspotifyAppKey| &m.callback_hash, + |m: &mut LibspotifyAppKey| &mut m.callback_hash, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LibspotifyAppKey", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LibspotifyAppKey { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LibspotifyAppKey::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LibspotifyAppKey::new) } } } @@ -3040,7 +3416,7 @@ impl ::protobuf::reflect::ProtobufValue for LibspotifyAppKey { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientInfo { // message fields limited: ::std::option::Option, @@ -3064,7 +3440,6 @@ impl ClientInfo { // optional bool limited = 1; - pub fn get_limited(&self) -> bool { self.limited.unwrap_or(false) } @@ -3083,9 +3458,10 @@ impl ClientInfo { // optional .ClientInfoFacebook fb = 2; - pub fn get_fb(&self) -> &ClientInfoFacebook { - self.fb.as_ref().unwrap_or_else(|| ClientInfoFacebook::default_instance()) + self.fb + .as_ref() + .unwrap_or_else(|| ClientInfoFacebook::default_instance()) } pub fn clear_fb(&mut self) { self.fb.clear(); @@ -3116,7 +3492,6 @@ impl ClientInfo { // optional string language = 3; - pub fn get_language(&self) -> &str { match self.language.as_ref() { Some(v) => &v, @@ -3147,7 +3522,9 @@ impl ClientInfo { // Take field pub fn take_language(&mut self) -> ::std::string::String { - self.language.take().unwrap_or_else(|| ::std::string::String::new()) + self.language + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -3157,30 +3534,40 @@ impl ::protobuf::Message for ClientInfo { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.limited = ::std::option::Option::Some(tmp); - }, + } 2 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.fb)?; - }, + } 3 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.language)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3205,7 +3592,10 @@ impl ::protobuf::Message for ClientInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.limited { os.write_bool(1, v)?; } @@ -3252,29 +3642,41 @@ impl ::protobuf::Message for ClientInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "limited", - |m: &ClientInfo| { &m.limited }, - |m: &mut ClientInfo| { &mut m.limited }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "fb", - |m: &ClientInfo| { &m.fb }, - |m: &mut ClientInfo| { &mut m.fb }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "language", - |m: &ClientInfo| { &m.language }, - |m: &mut ClientInfo| { &mut m.language }, + |m: &ClientInfo| &m.limited, + |m: &mut ClientInfo| &mut m.limited, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "fb", |m: &ClientInfo| &m.fb, |m: &mut ClientInfo| &mut m.fb + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "language", + |m: &ClientInfo| &m.language, + |m: &mut ClientInfo| &mut m.language, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientInfo", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3282,9 +3684,7 @@ impl ::protobuf::Message for ClientInfo { fn default_instance() -> &'static ClientInfo { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientInfo::new) - } + unsafe { instance.get(ClientInfo::new) } } } @@ -3309,7 +3709,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientInfo { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientInfoFacebook { // message fields machine_id: ::protobuf::SingularField<::std::string::String>, @@ -3331,7 +3731,6 @@ impl ClientInfoFacebook { // optional string machine_id = 1; - pub fn get_machine_id(&self) -> &str { match self.machine_id.as_ref() { Some(v) => &v, @@ -3362,7 +3761,9 @@ impl ClientInfoFacebook { // Take field pub fn take_machine_id(&mut self) -> ::std::string::String { - self.machine_id.take().unwrap_or_else(|| ::std::string::String::new()) + self.machine_id + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -3371,16 +3772,24 @@ impl ::protobuf::Message for ClientInfoFacebook { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.machine_id)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3398,7 +3807,10 @@ impl ::protobuf::Message for ClientInfoFacebook { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.machine_id.as_ref() { os.write_string(1, &v)?; } @@ -3437,29 +3849,34 @@ impl ::protobuf::Message for ClientInfoFacebook { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "machine_id", - |m: &ClientInfoFacebook| { &m.machine_id }, - |m: &mut ClientInfoFacebook| { &mut m.machine_id }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "machine_id", + |m: &ClientInfoFacebook| &m.machine_id, + |m: &mut ClientInfoFacebook| &mut m.machine_id, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientInfoFacebook", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ClientInfoFacebook { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientInfoFacebook::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ClientInfoFacebook::new) } } } @@ -3482,7 +3899,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientInfoFacebook { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct APWelcome { // message fields canonical_username: ::protobuf::SingularField<::std::string::String>, @@ -3511,7 +3928,6 @@ impl APWelcome { // required string canonical_username = 10; - pub fn get_canonical_username(&self) -> &str { match self.canonical_username.as_ref() { Some(v) => &v, @@ -3542,12 +3958,13 @@ impl APWelcome { // Take field pub fn take_canonical_username(&mut self) -> ::std::string::String { - self.canonical_username.take().unwrap_or_else(|| ::std::string::String::new()) + self.canonical_username + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // required .AccountType account_type_logged_in = 20; - pub fn get_account_type_logged_in(&self) -> AccountType { self.account_type_logged_in.unwrap_or(AccountType::Spotify) } @@ -3566,9 +3983,9 @@ impl APWelcome { // required .AccountType credentials_type_logged_in = 25; - pub fn get_credentials_type_logged_in(&self) -> AccountType { - self.credentials_type_logged_in.unwrap_or(AccountType::Spotify) + self.credentials_type_logged_in + .unwrap_or(AccountType::Spotify) } pub fn clear_credentials_type_logged_in(&mut self) { self.credentials_type_logged_in = ::std::option::Option::None; @@ -3585,9 +4002,9 @@ impl APWelcome { // required .AuthenticationType reusable_auth_credentials_type = 30; - pub fn get_reusable_auth_credentials_type(&self) -> AuthenticationType { - self.reusable_auth_credentials_type.unwrap_or(AuthenticationType::AUTHENTICATION_USER_PASS) + self.reusable_auth_credentials_type + .unwrap_or(AuthenticationType::AUTHENTICATION_USER_PASS) } pub fn clear_reusable_auth_credentials_type(&mut self) { self.reusable_auth_credentials_type = ::std::option::Option::None; @@ -3604,7 +4021,6 @@ impl APWelcome { // required bytes reusable_auth_credentials = 40; - pub fn get_reusable_auth_credentials(&self) -> &[u8] { match self.reusable_auth_credentials.as_ref() { Some(v) => &v, @@ -3635,12 +4051,13 @@ impl APWelcome { // Take field pub fn take_reusable_auth_credentials(&mut self) -> ::std::vec::Vec { - self.reusable_auth_credentials.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.reusable_auth_credentials + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bytes lfs_secret = 50; - pub fn get_lfs_secret(&self) -> &[u8] { match self.lfs_secret.as_ref() { Some(v) => &v, @@ -3671,14 +4088,17 @@ impl APWelcome { // Take field pub fn take_lfs_secret(&mut self) -> ::std::vec::Vec { - self.lfs_secret.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.lfs_secret + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional .AccountInfo account_info = 60; - pub fn get_account_info(&self) -> &AccountInfo { - self.account_info.as_ref().unwrap_or_else(|| AccountInfo::default_instance()) + self.account_info + .as_ref() + .unwrap_or_else(|| AccountInfo::default_instance()) } pub fn clear_account_info(&mut self) { self.account_info.clear(); @@ -3704,14 +4124,17 @@ impl APWelcome { // Take field pub fn take_account_info(&mut self) -> AccountInfo { - self.account_info.take().unwrap_or_else(|| AccountInfo::new()) + self.account_info + .take() + .unwrap_or_else(|| AccountInfo::new()) } // optional .AccountInfoFacebook fb = 70; - pub fn get_fb(&self) -> &AccountInfoFacebook { - self.fb.as_ref().unwrap_or_else(|| AccountInfoFacebook::default_instance()) + self.fb + .as_ref() + .unwrap_or_else(|| AccountInfoFacebook::default_instance()) } pub fn clear_fb(&mut self) { self.fb.clear(); @@ -3762,46 +4185,78 @@ impl ::protobuf::Message for APWelcome { if !v.is_initialized() { return false; } - }; + } for v in &self.fb { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.canonical_username)?; - }, - 20 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.account_type_logged_in, 20, &mut self.unknown_fields)? - }, - 25 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.credentials_type_logged_in, 25, &mut self.unknown_fields)? - }, - 30 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.reusable_auth_credentials_type, 30, &mut self.unknown_fields)? - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.canonical_username, + )?; + } + 20 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.account_type_logged_in, + 20, + &mut self.unknown_fields, + )?, + 25 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.credentials_type_logged_in, + 25, + &mut self.unknown_fields, + )?, + 30 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.reusable_auth_credentials_type, + 30, + &mut self.unknown_fields, + )?, 40 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.reusable_auth_credentials)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.reusable_auth_credentials, + )?; + } 50 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.lfs_secret)?; - }, + } 60 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.account_info)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.account_info, + )?; + } 70 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.fb)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3842,7 +4297,10 @@ impl ::protobuf::Message for APWelcome { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.canonical_username.as_ref() { os.write_string(10, &v)?; } @@ -3906,54 +4364,87 @@ impl ::protobuf::Message for APWelcome { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "canonical_username", - |m: &APWelcome| { &m.canonical_username }, - |m: &mut APWelcome| { &mut m.canonical_username }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "canonical_username", + |m: &APWelcome| &m.canonical_username, + |m: &mut APWelcome| &mut m.canonical_username, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "account_type_logged_in", - |m: &APWelcome| { &m.account_type_logged_in }, - |m: &mut APWelcome| { &mut m.account_type_logged_in }, + |m: &APWelcome| &m.account_type_logged_in, + |m: &mut APWelcome| &mut m.account_type_logged_in, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "credentials_type_logged_in", - |m: &APWelcome| { &m.credentials_type_logged_in }, - |m: &mut APWelcome| { &mut m.credentials_type_logged_in }, + |m: &APWelcome| &m.credentials_type_logged_in, + |m: &mut APWelcome| &mut m.credentials_type_logged_in, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "reusable_auth_credentials_type", - |m: &APWelcome| { &m.reusable_auth_credentials_type }, - |m: &mut APWelcome| { &mut m.reusable_auth_credentials_type }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "reusable_auth_credentials", - |m: &APWelcome| { &m.reusable_auth_credentials }, - |m: &mut APWelcome| { &mut m.reusable_auth_credentials }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "lfs_secret", - |m: &APWelcome| { &m.lfs_secret }, - |m: &mut APWelcome| { &mut m.lfs_secret }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "account_info", - |m: &APWelcome| { &m.account_info }, - |m: &mut APWelcome| { &mut m.account_info }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "fb", - |m: &APWelcome| { &m.fb }, - |m: &mut APWelcome| { &mut m.fb }, + |m: &APWelcome| &m.reusable_auth_credentials_type, + |m: &mut APWelcome| &mut m.reusable_auth_credentials_type, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "reusable_auth_credentials", + |m: &APWelcome| &m.reusable_auth_credentials, + |m: &mut APWelcome| &mut m.reusable_auth_credentials, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "lfs_secret", + |m: &APWelcome| &m.lfs_secret, + |m: &mut APWelcome| &mut m.lfs_secret, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "account_info", + |m: &APWelcome| &m.account_info, + |m: &mut APWelcome| &mut m.account_info, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "fb", |m: &APWelcome| &m.fb, |m: &mut APWelcome| &mut m.fb + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APWelcome", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3961,9 +4452,7 @@ impl ::protobuf::Message for APWelcome { fn default_instance() -> &'static APWelcome { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(APWelcome::new) - } + unsafe { instance.get(APWelcome::new) } } } @@ -3993,7 +4482,7 @@ impl ::protobuf::reflect::ProtobufValue for APWelcome { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct AccountInfo { // message fields spotify: ::protobuf::SingularPtrField, @@ -4016,9 +4505,10 @@ impl AccountInfo { // optional .AccountInfoSpotify spotify = 1; - pub fn get_spotify(&self) -> &AccountInfoSpotify { - self.spotify.as_ref().unwrap_or_else(|| AccountInfoSpotify::default_instance()) + self.spotify + .as_ref() + .unwrap_or_else(|| AccountInfoSpotify::default_instance()) } pub fn clear_spotify(&mut self) { self.spotify.clear(); @@ -4044,14 +4534,17 @@ impl AccountInfo { // Take field pub fn take_spotify(&mut self) -> AccountInfoSpotify { - self.spotify.take().unwrap_or_else(|| AccountInfoSpotify::new()) + self.spotify + .take() + .unwrap_or_else(|| AccountInfoSpotify::new()) } // optional .AccountInfoFacebook facebook = 2; - pub fn get_facebook(&self) -> &AccountInfoFacebook { - self.facebook.as_ref().unwrap_or_else(|| AccountInfoFacebook::default_instance()) + self.facebook + .as_ref() + .unwrap_or_else(|| AccountInfoFacebook::default_instance()) } pub fn clear_facebook(&mut self) { self.facebook.clear(); @@ -4077,7 +4570,9 @@ impl AccountInfo { // Take field pub fn take_facebook(&mut self) -> AccountInfoFacebook { - self.facebook.take().unwrap_or_else(|| AccountInfoFacebook::new()) + self.facebook + .take() + .unwrap_or_else(|| AccountInfoFacebook::new()) } } @@ -4087,28 +4582,36 @@ impl ::protobuf::Message for AccountInfo { if !v.is_initialized() { return false; } - }; + } for v in &self.facebook { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.spotify)?; - }, + } 2 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.facebook)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4131,7 +4634,10 @@ impl ::protobuf::Message for AccountInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.spotify.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -4177,24 +4683,35 @@ impl ::protobuf::Message for AccountInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "spotify", - |m: &AccountInfo| { &m.spotify }, - |m: &mut AccountInfo| { &mut m.spotify }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "facebook", - |m: &AccountInfo| { &m.facebook }, - |m: &mut AccountInfo| { &mut m.facebook }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "spotify", + |m: &AccountInfo| &m.spotify, + |m: &mut AccountInfo| &mut m.spotify, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "facebook", + |m: &AccountInfo| &m.facebook, + |m: &mut AccountInfo| &mut m.facebook, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AccountInfo", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -4202,9 +4719,7 @@ impl ::protobuf::Message for AccountInfo { fn default_instance() -> &'static AccountInfo { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(AccountInfo::new) - } + unsafe { instance.get(AccountInfo::new) } } } @@ -4228,7 +4743,7 @@ impl ::protobuf::reflect::ProtobufValue for AccountInfo { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct AccountInfoSpotify { // special fields pub unknown_fields: ::protobuf::UnknownFields, @@ -4252,13 +4767,21 @@ impl ::protobuf::Message for AccountInfoSpotify { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4273,7 +4796,10 @@ impl ::protobuf::Message for AccountInfoSpotify { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4309,24 +4835,24 @@ impl ::protobuf::Message for AccountInfoSpotify { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AccountInfoSpotify", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static AccountInfoSpotify { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(AccountInfoSpotify::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(AccountInfoSpotify::new) } } } @@ -4348,7 +4874,7 @@ impl ::protobuf::reflect::ProtobufValue for AccountInfoSpotify { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct AccountInfoFacebook { // message fields access_token: ::protobuf::SingularField<::std::string::String>, @@ -4371,7 +4897,6 @@ impl AccountInfoFacebook { // optional string access_token = 1; - pub fn get_access_token(&self) -> &str { match self.access_token.as_ref() { Some(v) => &v, @@ -4402,12 +4927,13 @@ impl AccountInfoFacebook { // Take field pub fn take_access_token(&mut self) -> ::std::string::String { - self.access_token.take().unwrap_or_else(|| ::std::string::String::new()) + self.access_token + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string machine_id = 2; - pub fn get_machine_id(&self) -> &str { match self.machine_id.as_ref() { Some(v) => &v, @@ -4438,7 +4964,9 @@ impl AccountInfoFacebook { // Take field pub fn take_machine_id(&mut self) -> ::std::string::String { - self.machine_id.take().unwrap_or_else(|| ::std::string::String::new()) + self.machine_id + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -4447,19 +4975,31 @@ impl ::protobuf::Message for AccountInfoFacebook { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.access_token)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.access_token, + )?; + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.machine_id)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4480,7 +5020,10 @@ impl ::protobuf::Message for AccountInfoFacebook { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.access_token.as_ref() { os.write_string(1, &v)?; } @@ -4522,34 +5065,44 @@ impl ::protobuf::Message for AccountInfoFacebook { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "access_token", - |m: &AccountInfoFacebook| { &m.access_token }, - |m: &mut AccountInfoFacebook| { &mut m.access_token }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "machine_id", - |m: &AccountInfoFacebook| { &m.machine_id }, - |m: &mut AccountInfoFacebook| { &mut m.machine_id }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "access_token", + |m: &AccountInfoFacebook| &m.access_token, + |m: &mut AccountInfoFacebook| &mut m.access_token, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "machine_id", + |m: &AccountInfoFacebook| &m.machine_id, + |m: &mut AccountInfoFacebook| &mut m.machine_id, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AccountInfoFacebook", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static AccountInfoFacebook { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(AccountInfoFacebook::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(AccountInfoFacebook::new) } } } @@ -4573,7 +5126,7 @@ impl ::protobuf::reflect::ProtobufValue for AccountInfoFacebook { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum AuthenticationType { AUTHENTICATION_USER_PASS = 0, AUTHENTICATION_STORED_SPOTIFY_CREDENTIALS = 1, @@ -4590,11 +5143,15 @@ impl ::protobuf::ProtobufEnum for AuthenticationType { fn from_i32(value: i32) -> ::std::option::Option { match value { 0 => ::std::option::Option::Some(AuthenticationType::AUTHENTICATION_USER_PASS), - 1 => ::std::option::Option::Some(AuthenticationType::AUTHENTICATION_STORED_SPOTIFY_CREDENTIALS), - 2 => ::std::option::Option::Some(AuthenticationType::AUTHENTICATION_STORED_FACEBOOK_CREDENTIALS), + 1 => ::std::option::Option::Some( + AuthenticationType::AUTHENTICATION_STORED_SPOTIFY_CREDENTIALS, + ), + 2 => ::std::option::Option::Some( + AuthenticationType::AUTHENTICATION_STORED_FACEBOOK_CREDENTIALS, + ), 3 => ::std::option::Option::Some(AuthenticationType::AUTHENTICATION_SPOTIFY_TOKEN), 4 => ::std::option::Option::Some(AuthenticationType::AUTHENTICATION_FACEBOOK_TOKEN), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -4610,17 +5167,20 @@ impl ::protobuf::ProtobufEnum for AuthenticationType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("AuthenticationType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "AuthenticationType", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for AuthenticationType { -} +impl ::std::marker::Copy for AuthenticationType {} impl ::std::default::Default for AuthenticationType { fn default() -> Self { @@ -4634,7 +5194,7 @@ impl ::protobuf::reflect::ProtobufValue for AuthenticationType { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum AccountCreation { ACCOUNT_CREATION_ALWAYS_PROMPT = 1, ACCOUNT_CREATION_ALWAYS_CREATE = 3, @@ -4649,7 +5209,7 @@ impl ::protobuf::ProtobufEnum for AccountCreation { match value { 1 => ::std::option::Option::Some(AccountCreation::ACCOUNT_CREATION_ALWAYS_PROMPT), 3 => ::std::option::Option::Some(AccountCreation::ACCOUNT_CREATION_ALWAYS_CREATE), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -4662,17 +5222,20 @@ impl ::protobuf::ProtobufEnum for AccountCreation { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("AccountCreation", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "AccountCreation", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for AccountCreation { -} +impl ::std::marker::Copy for AccountCreation {} // Note, `Default` is implemented although default value is not 0 impl ::std::default::Default for AccountCreation { @@ -4687,7 +5250,7 @@ impl ::protobuf::reflect::ProtobufValue for AccountCreation { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum CpuFamily { CPU_UNKNOWN = 0, CPU_X86 = 1, @@ -4718,7 +5281,7 @@ impl ::protobuf::ProtobufEnum for CpuFamily { 7 => ::std::option::Option::Some(CpuFamily::CPU_SH), 8 => ::std::option::Option::Some(CpuFamily::CPU_MIPS), 9 => ::std::option::Option::Some(CpuFamily::CPU_BLACKFIN), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -4739,17 +5302,20 @@ impl ::protobuf::ProtobufEnum for CpuFamily { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("CpuFamily", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "CpuFamily", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for CpuFamily { -} +impl ::std::marker::Copy for CpuFamily {} impl ::std::default::Default for CpuFamily { fn default() -> Self { @@ -4763,7 +5329,7 @@ impl ::protobuf::reflect::ProtobufValue for CpuFamily { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Brand { BRAND_UNBRANDED = 0, BRAND_INQ = 1, @@ -4782,7 +5348,7 @@ impl ::protobuf::ProtobufEnum for Brand { 1 => ::std::option::Option::Some(Brand::BRAND_INQ), 2 => ::std::option::Option::Some(Brand::BRAND_HTC), 3 => ::std::option::Option::Some(Brand::BRAND_NOKIA), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -4797,17 +5363,20 @@ impl ::protobuf::ProtobufEnum for Brand { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Brand", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Brand", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Brand { -} +impl ::std::marker::Copy for Brand {} impl ::std::default::Default for Brand { fn default() -> Self { @@ -4821,7 +5390,7 @@ impl ::protobuf::reflect::ProtobufValue for Brand { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Os { OS_UNKNOWN = 0, OS_WINDOWS = 1, @@ -4878,7 +5447,7 @@ impl ::protobuf::ProtobufEnum for Os { 20 => ::std::option::Option::Some(Os::OS_MEEGO), 21 => ::std::option::Option::Some(Os::OS_QNXNTO), 22 => ::std::option::Option::Some(Os::OS_BCO), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -4912,17 +5481,20 @@ impl ::protobuf::ProtobufEnum for Os { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Os", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Os", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Os { -} +impl ::std::marker::Copy for Os {} impl ::std::default::Default for Os { fn default() -> Self { @@ -4936,7 +5508,7 @@ impl ::protobuf::reflect::ProtobufValue for Os { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum AccountType { Spotify = 0, Facebook = 1, @@ -4951,30 +5523,30 @@ impl ::protobuf::ProtobufEnum for AccountType { match value { 0 => ::std::option::Option::Some(AccountType::Spotify), 1 => ::std::option::Option::Some(AccountType::Facebook), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } fn values() -> &'static [Self] { - static values: &'static [AccountType] = &[ - AccountType::Spotify, - AccountType::Facebook, - ]; + static values: &'static [AccountType] = &[AccountType::Spotify, AccountType::Facebook]; values } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("AccountType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "AccountType", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for AccountType { -} +impl ::std::marker::Copy for AccountType {} impl ::std::default::Default for AccountType { fn default() -> Self { @@ -5062,16 +5634,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x10\0\x12\x0c\n\x08Facebook\x10\x01\x1a\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/keyexchange.rs b/protocol/src/keyexchange.rs index cfe1aec3..7b1b294b 100644 --- a/protocol/src/keyexchange.rs +++ b/protocol/src/keyexchange.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientHello { // message fields build_info: ::protobuf::SingularPtrField, @@ -55,9 +55,10 @@ impl ClientHello { // required .BuildInfo build_info = 10; - pub fn get_build_info(&self) -> &BuildInfo { - self.build_info.as_ref().unwrap_or_else(|| BuildInfo::default_instance()) + self.build_info + .as_ref() + .unwrap_or_else(|| BuildInfo::default_instance()) } pub fn clear_build_info(&mut self) { self.build_info.clear(); @@ -88,7 +89,6 @@ impl ClientHello { // repeated .Fingerprint fingerprints_supported = 20; - pub fn get_fingerprints_supported(&self) -> &[Fingerprint] { &self.fingerprints_supported } @@ -113,7 +113,6 @@ impl ClientHello { // repeated .Cryptosuite cryptosuites_supported = 30; - pub fn get_cryptosuites_supported(&self) -> &[Cryptosuite] { &self.cryptosuites_supported } @@ -138,7 +137,6 @@ impl ClientHello { // repeated .Powscheme powschemes_supported = 40; - pub fn get_powschemes_supported(&self) -> &[Powscheme] { &self.powschemes_supported } @@ -163,9 +161,10 @@ impl ClientHello { // required .LoginCryptoHelloUnion login_crypto_hello = 50; - pub fn get_login_crypto_hello(&self) -> &LoginCryptoHelloUnion { - self.login_crypto_hello.as_ref().unwrap_or_else(|| LoginCryptoHelloUnion::default_instance()) + self.login_crypto_hello + .as_ref() + .unwrap_or_else(|| LoginCryptoHelloUnion::default_instance()) } pub fn clear_login_crypto_hello(&mut self) { self.login_crypto_hello.clear(); @@ -191,12 +190,13 @@ impl ClientHello { // Take field pub fn take_login_crypto_hello(&mut self) -> LoginCryptoHelloUnion { - self.login_crypto_hello.take().unwrap_or_else(|| LoginCryptoHelloUnion::new()) + self.login_crypto_hello + .take() + .unwrap_or_else(|| LoginCryptoHelloUnion::new()) } // required bytes client_nonce = 60; - pub fn get_client_nonce(&self) -> &[u8] { match self.client_nonce.as_ref() { Some(v) => &v, @@ -227,12 +227,13 @@ impl ClientHello { // Take field pub fn take_client_nonce(&mut self) -> ::std::vec::Vec { - self.client_nonce.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.client_nonce + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bytes padding = 70; - pub fn get_padding(&self) -> &[u8] { match self.padding.as_ref() { Some(v) => &v, @@ -263,14 +264,17 @@ impl ClientHello { // Take field pub fn take_padding(&mut self) -> ::std::vec::Vec { - self.padding.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.padding + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional .FeatureSet feature_set = 80; - pub fn get_feature_set(&self) -> &FeatureSet { - self.feature_set.as_ref().unwrap_or_else(|| FeatureSet::default_instance()) + self.feature_set + .as_ref() + .unwrap_or_else(|| FeatureSet::default_instance()) } pub fn clear_feature_set(&mut self) { self.feature_set.clear(); @@ -315,51 +319,87 @@ impl ::protobuf::Message for ClientHello { if !v.is_initialized() { return false; } - }; + } for v in &self.login_crypto_hello { if !v.is_initialized() { return false; } - }; + } for v in &self.feature_set { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.build_info)?; - }, - 20 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.fingerprints_supported, 20, &mut self.unknown_fields)? - }, - 30 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.cryptosuites_supported, 30, &mut self.unknown_fields)? - }, - 40 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.powschemes_supported, 40, &mut self.unknown_fields)? - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.build_info, + )?; + } + 20 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.fingerprints_supported, + 20, + &mut self.unknown_fields, + )?, + 30 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.cryptosuites_supported, + 30, + &mut self.unknown_fields, + )?, + 40 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.powschemes_supported, + 40, + &mut self.unknown_fields, + )?, 50 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.login_crypto_hello)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.login_crypto_hello, + )?; + } 60 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.client_nonce)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.client_nonce, + )?; + } 70 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.padding)?; - }, + } 80 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.feature_set)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.feature_set, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -375,13 +415,13 @@ impl ::protobuf::Message for ClientHello { } for value in &self.fingerprints_supported { my_size += ::protobuf::rt::enum_size(20, *value); - }; + } for value in &self.cryptosuites_supported { my_size += ::protobuf::rt::enum_size(30, *value); - }; + } for value in &self.powschemes_supported { my_size += ::protobuf::rt::enum_size(40, *value); - }; + } if let Some(ref v) = self.login_crypto_hello.as_ref() { let len = v.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -401,7 +441,10 @@ impl ::protobuf::Message for ClientHello { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.build_info.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -409,13 +452,13 @@ impl ::protobuf::Message for ClientHello { } for v in &self.fingerprints_supported { os.write_enum(20, v.value())?; - }; + } for v in &self.cryptosuites_supported { os.write_enum(30, v.value())?; - }; + } for v in &self.powschemes_supported { os.write_enum(40, v.value())?; - }; + } if let Some(ref v) = self.login_crypto_hello.as_ref() { os.write_tag(50, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -467,54 +510,89 @@ impl ::protobuf::Message for ClientHello { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "build_info", - |m: &ClientHello| { &m.build_info }, - |m: &mut ClientHello| { &mut m.build_info }, - )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "build_info", + |m: &ClientHello| &m.build_info, + |m: &mut ClientHello| &mut m.build_info, + ), + ); + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "fingerprints_supported", - |m: &ClientHello| { &m.fingerprints_supported }, - |m: &mut ClientHello| { &mut m.fingerprints_supported }, + |m: &ClientHello| &m.fingerprints_supported, + |m: &mut ClientHello| &mut m.fingerprints_supported, )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "cryptosuites_supported", - |m: &ClientHello| { &m.cryptosuites_supported }, - |m: &mut ClientHello| { &mut m.cryptosuites_supported }, + |m: &ClientHello| &m.cryptosuites_supported, + |m: &mut ClientHello| &mut m.cryptosuites_supported, )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "powschemes_supported", - |m: &ClientHello| { &m.powschemes_supported }, - |m: &mut ClientHello| { &mut m.powschemes_supported }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "login_crypto_hello", - |m: &ClientHello| { &m.login_crypto_hello }, - |m: &mut ClientHello| { &mut m.login_crypto_hello }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "client_nonce", - |m: &ClientHello| { &m.client_nonce }, - |m: &mut ClientHello| { &mut m.client_nonce }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "padding", - |m: &ClientHello| { &m.padding }, - |m: &mut ClientHello| { &mut m.padding }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "feature_set", - |m: &ClientHello| { &m.feature_set }, - |m: &mut ClientHello| { &mut m.feature_set }, + |m: &ClientHello| &m.powschemes_supported, + |m: &mut ClientHello| &mut m.powschemes_supported, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "login_crypto_hello", + |m: &ClientHello| &m.login_crypto_hello, + |m: &mut ClientHello| &mut m.login_crypto_hello, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "client_nonce", + |m: &ClientHello| &m.client_nonce, + |m: &mut ClientHello| &mut m.client_nonce, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "padding", + |m: &ClientHello| &m.padding, + |m: &mut ClientHello| &mut m.padding, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "feature_set", + |m: &ClientHello| &m.feature_set, + |m: &mut ClientHello| &mut m.feature_set, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientHello", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -522,9 +600,7 @@ impl ::protobuf::Message for ClientHello { fn default_instance() -> &'static ClientHello { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientHello::new) - } + unsafe { instance.get(ClientHello::new) } } } @@ -554,7 +630,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientHello { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct BuildInfo { // message fields product: ::std::option::Option, @@ -579,7 +655,6 @@ impl BuildInfo { // required .Product product = 10; - pub fn get_product(&self) -> Product { self.product.unwrap_or(Product::PRODUCT_CLIENT) } @@ -598,7 +673,6 @@ impl BuildInfo { // repeated .ProductFlags product_flags = 20; - pub fn get_product_flags(&self) -> &[ProductFlags] { &self.product_flags } @@ -623,7 +697,6 @@ impl BuildInfo { // required .Platform platform = 30; - pub fn get_platform(&self) -> Platform { self.platform.unwrap_or(Platform::PLATFORM_WIN32_X86) } @@ -642,7 +715,6 @@ impl BuildInfo { // required uint64 version = 40; - pub fn get_version(&self) -> u64 { self.version.unwrap_or(0) } @@ -674,29 +746,51 @@ impl ::protobuf::Message for BuildInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 10 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.product, 10, &mut self.unknown_fields)? - }, - 20 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.product_flags, 20, &mut self.unknown_fields)? - }, - 30 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.platform, 30, &mut self.unknown_fields)? - }, + 10 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.product, + 10, + &mut self.unknown_fields, + )?, + 20 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.product_flags, + 20, + &mut self.unknown_fields, + )?, + 30 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.platform, + 30, + &mut self.unknown_fields, + )?, 40 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint64()?; self.version = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -711,7 +805,7 @@ impl ::protobuf::Message for BuildInfo { } for value in &self.product_flags { my_size += ::protobuf::rt::enum_size(20, *value); - }; + } if let Some(v) = self.platform { my_size += ::protobuf::rt::enum_size(30, v); } @@ -723,13 +817,16 @@ impl ::protobuf::Message for BuildInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.product { os.write_enum(10, v.value())?; } for v in &self.product_flags { os.write_enum(20, v.value())?; - }; + } if let Some(v) = self.platform { os.write_enum(30, v.value())?; } @@ -771,34 +868,47 @@ impl ::protobuf::Message for BuildInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "product", - |m: &BuildInfo| { &m.product }, - |m: &mut BuildInfo| { &mut m.product }, + |m: &BuildInfo| &m.product, + |m: &mut BuildInfo| &mut m.product, )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "product_flags", - |m: &BuildInfo| { &m.product_flags }, - |m: &mut BuildInfo| { &mut m.product_flags }, + |m: &BuildInfo| &m.product_flags, + |m: &mut BuildInfo| &mut m.product_flags, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "platform", - |m: &BuildInfo| { &m.platform }, - |m: &mut BuildInfo| { &mut m.platform }, + |m: &BuildInfo| &m.platform, + |m: &mut BuildInfo| &mut m.platform, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint64, + >( "version", - |m: &BuildInfo| { &m.version }, - |m: &mut BuildInfo| { &mut m.version }, + |m: &BuildInfo| &m.version, + |m: &mut BuildInfo| &mut m.version, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "BuildInfo", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -806,9 +916,7 @@ impl ::protobuf::Message for BuildInfo { fn default_instance() -> &'static BuildInfo { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(BuildInfo::new) - } + unsafe { instance.get(BuildInfo::new) } } } @@ -834,7 +942,7 @@ impl ::protobuf::reflect::ProtobufValue for BuildInfo { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCryptoHelloUnion { // message fields diffie_hellman: ::protobuf::SingularPtrField, @@ -856,9 +964,10 @@ impl LoginCryptoHelloUnion { // optional .LoginCryptoDiffieHellmanHello diffie_hellman = 10; - pub fn get_diffie_hellman(&self) -> &LoginCryptoDiffieHellmanHello { - self.diffie_hellman.as_ref().unwrap_or_else(|| LoginCryptoDiffieHellmanHello::default_instance()) + self.diffie_hellman + .as_ref() + .unwrap_or_else(|| LoginCryptoDiffieHellmanHello::default_instance()) } pub fn clear_diffie_hellman(&mut self) { self.diffie_hellman.clear(); @@ -884,7 +993,9 @@ impl LoginCryptoHelloUnion { // Take field pub fn take_diffie_hellman(&mut self) -> LoginCryptoDiffieHellmanHello { - self.diffie_hellman.take().unwrap_or_else(|| LoginCryptoDiffieHellmanHello::new()) + self.diffie_hellman + .take() + .unwrap_or_else(|| LoginCryptoDiffieHellmanHello::new()) } } @@ -894,20 +1005,32 @@ impl ::protobuf::Message for LoginCryptoHelloUnion { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.diffie_hellman)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.diffie_hellman, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -926,7 +1049,10 @@ impl ::protobuf::Message for LoginCryptoHelloUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.diffie_hellman.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -967,29 +1093,34 @@ impl ::protobuf::Message for LoginCryptoHelloUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "diffie_hellman", - |m: &LoginCryptoHelloUnion| { &m.diffie_hellman }, - |m: &mut LoginCryptoHelloUnion| { &mut m.diffie_hellman }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "diffie_hellman", + |m: &LoginCryptoHelloUnion| &m.diffie_hellman, + |m: &mut LoginCryptoHelloUnion| &mut m.diffie_hellman, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoHelloUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LoginCryptoHelloUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCryptoHelloUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCryptoHelloUnion::new) } } } @@ -1012,7 +1143,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCryptoHelloUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCryptoDiffieHellmanHello { // message fields gc: ::protobuf::SingularField<::std::vec::Vec>, @@ -1035,7 +1166,6 @@ impl LoginCryptoDiffieHellmanHello { // required bytes gc = 10; - pub fn get_gc(&self) -> &[u8] { match self.gc.as_ref() { Some(v) => &v, @@ -1071,7 +1201,6 @@ impl LoginCryptoDiffieHellmanHello { // required uint32 server_keys_known = 20; - pub fn get_server_keys_known(&self) -> u32 { self.server_keys_known.unwrap_or(0) } @@ -1100,23 +1229,33 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gc)?; - }, + } 20 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.server_keys_known = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1137,7 +1276,10 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gc.as_ref() { os.write_bytes(10, &v)?; } @@ -1179,7 +1321,8 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -1203,10 +1346,9 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanHello { } fn default_instance() -> &'static LoginCryptoDiffieHellmanHello { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCryptoDiffieHellmanHello::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCryptoDiffieHellmanHello::new) } } } @@ -1230,7 +1372,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanHello { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FeatureSet { // message fields autoupdate2: ::std::option::Option, @@ -1253,7 +1395,6 @@ impl FeatureSet { // optional bool autoupdate2 = 1; - pub fn get_autoupdate2(&self) -> bool { self.autoupdate2.unwrap_or(false) } @@ -1272,7 +1413,6 @@ impl FeatureSet { // optional bool current_location = 2; - pub fn get_current_location(&self) -> bool { self.current_location.unwrap_or(false) } @@ -1295,27 +1435,39 @@ impl ::protobuf::Message for FeatureSet { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.autoupdate2 = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.current_location = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1336,7 +1488,10 @@ impl ::protobuf::Message for FeatureSet { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.autoupdate2 { os.write_bool(1, v)?; } @@ -1378,24 +1533,31 @@ impl ::protobuf::Message for FeatureSet { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "autoupdate2", - |m: &FeatureSet| { &m.autoupdate2 }, - |m: &mut FeatureSet| { &mut m.autoupdate2 }, + |m: &FeatureSet| &m.autoupdate2, + |m: &mut FeatureSet| &mut m.autoupdate2, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "current_location", - |m: &FeatureSet| { &m.current_location }, - |m: &mut FeatureSet| { &mut m.current_location }, + |m: &FeatureSet| &m.current_location, + |m: &mut FeatureSet| &mut m.current_location, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FeatureSet", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1403,9 +1565,7 @@ impl ::protobuf::Message for FeatureSet { fn default_instance() -> &'static FeatureSet { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FeatureSet::new) - } + unsafe { instance.get(FeatureSet::new) } } } @@ -1429,7 +1589,7 @@ impl ::protobuf::reflect::ProtobufValue for FeatureSet { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct APResponseMessage { // message fields challenge: ::protobuf::SingularPtrField, @@ -1453,9 +1613,10 @@ impl APResponseMessage { // optional .APChallenge challenge = 10; - pub fn get_challenge(&self) -> &APChallenge { - self.challenge.as_ref().unwrap_or_else(|| APChallenge::default_instance()) + self.challenge + .as_ref() + .unwrap_or_else(|| APChallenge::default_instance()) } pub fn clear_challenge(&mut self) { self.challenge.clear(); @@ -1486,9 +1647,10 @@ impl APResponseMessage { // optional .UpgradeRequiredMessage upgrade = 20; - pub fn get_upgrade(&self) -> &UpgradeRequiredMessage { - self.upgrade.as_ref().unwrap_or_else(|| UpgradeRequiredMessage::default_instance()) + self.upgrade + .as_ref() + .unwrap_or_else(|| UpgradeRequiredMessage::default_instance()) } pub fn clear_upgrade(&mut self) { self.upgrade.clear(); @@ -1514,14 +1676,17 @@ impl APResponseMessage { // Take field pub fn take_upgrade(&mut self) -> UpgradeRequiredMessage { - self.upgrade.take().unwrap_or_else(|| UpgradeRequiredMessage::new()) + self.upgrade + .take() + .unwrap_or_else(|| UpgradeRequiredMessage::new()) } // optional .APLoginFailed login_failed = 30; - pub fn get_login_failed(&self) -> &APLoginFailed { - self.login_failed.as_ref().unwrap_or_else(|| APLoginFailed::default_instance()) + self.login_failed + .as_ref() + .unwrap_or_else(|| APLoginFailed::default_instance()) } pub fn clear_login_failed(&mut self) { self.login_failed.clear(); @@ -1547,7 +1712,9 @@ impl APResponseMessage { // Take field pub fn take_login_failed(&mut self) -> APLoginFailed { - self.login_failed.take().unwrap_or_else(|| APLoginFailed::new()) + self.login_failed + .take() + .unwrap_or_else(|| APLoginFailed::new()) } } @@ -1557,36 +1724,48 @@ impl ::protobuf::Message for APResponseMessage { if !v.is_initialized() { return false; } - }; + } for v in &self.upgrade { if !v.is_initialized() { return false; } - }; + } for v in &self.login_failed { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.challenge)?; - }, + } 20 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.upgrade)?; - }, + } 30 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.login_failed)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.login_failed, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1613,7 +1792,10 @@ impl ::protobuf::Message for APResponseMessage { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.challenge.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -1664,39 +1846,54 @@ impl ::protobuf::Message for APResponseMessage { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "challenge", - |m: &APResponseMessage| { &m.challenge }, - |m: &mut APResponseMessage| { &mut m.challenge }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "upgrade", - |m: &APResponseMessage| { &m.upgrade }, - |m: &mut APResponseMessage| { &mut m.upgrade }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "login_failed", - |m: &APResponseMessage| { &m.login_failed }, - |m: &mut APResponseMessage| { &mut m.login_failed }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "challenge", + |m: &APResponseMessage| &m.challenge, + |m: &mut APResponseMessage| &mut m.challenge, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "upgrade", + |m: &APResponseMessage| &m.upgrade, + |m: &mut APResponseMessage| &mut m.upgrade, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "login_failed", + |m: &APResponseMessage| &m.login_failed, + |m: &mut APResponseMessage| &mut m.login_failed, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APResponseMessage", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static APResponseMessage { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(APResponseMessage::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(APResponseMessage::new) } } } @@ -1721,7 +1918,7 @@ impl ::protobuf::reflect::ProtobufValue for APResponseMessage { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct APChallenge { // message fields login_crypto_challenge: ::protobuf::SingularPtrField, @@ -1748,9 +1945,10 @@ impl APChallenge { // required .LoginCryptoChallengeUnion login_crypto_challenge = 10; - pub fn get_login_crypto_challenge(&self) -> &LoginCryptoChallengeUnion { - self.login_crypto_challenge.as_ref().unwrap_or_else(|| LoginCryptoChallengeUnion::default_instance()) + self.login_crypto_challenge + .as_ref() + .unwrap_or_else(|| LoginCryptoChallengeUnion::default_instance()) } pub fn clear_login_crypto_challenge(&mut self) { self.login_crypto_challenge.clear(); @@ -1776,14 +1974,17 @@ impl APChallenge { // Take field pub fn take_login_crypto_challenge(&mut self) -> LoginCryptoChallengeUnion { - self.login_crypto_challenge.take().unwrap_or_else(|| LoginCryptoChallengeUnion::new()) + self.login_crypto_challenge + .take() + .unwrap_or_else(|| LoginCryptoChallengeUnion::new()) } // required .FingerprintChallengeUnion fingerprint_challenge = 20; - pub fn get_fingerprint_challenge(&self) -> &FingerprintChallengeUnion { - self.fingerprint_challenge.as_ref().unwrap_or_else(|| FingerprintChallengeUnion::default_instance()) + self.fingerprint_challenge + .as_ref() + .unwrap_or_else(|| FingerprintChallengeUnion::default_instance()) } pub fn clear_fingerprint_challenge(&mut self) { self.fingerprint_challenge.clear(); @@ -1809,14 +2010,17 @@ impl APChallenge { // Take field pub fn take_fingerprint_challenge(&mut self) -> FingerprintChallengeUnion { - self.fingerprint_challenge.take().unwrap_or_else(|| FingerprintChallengeUnion::new()) + self.fingerprint_challenge + .take() + .unwrap_or_else(|| FingerprintChallengeUnion::new()) } // required .PoWChallengeUnion pow_challenge = 30; - pub fn get_pow_challenge(&self) -> &PoWChallengeUnion { - self.pow_challenge.as_ref().unwrap_or_else(|| PoWChallengeUnion::default_instance()) + self.pow_challenge + .as_ref() + .unwrap_or_else(|| PoWChallengeUnion::default_instance()) } pub fn clear_pow_challenge(&mut self) { self.pow_challenge.clear(); @@ -1842,14 +2046,17 @@ impl APChallenge { // Take field pub fn take_pow_challenge(&mut self) -> PoWChallengeUnion { - self.pow_challenge.take().unwrap_or_else(|| PoWChallengeUnion::new()) + self.pow_challenge + .take() + .unwrap_or_else(|| PoWChallengeUnion::new()) } // required .CryptoChallengeUnion crypto_challenge = 40; - pub fn get_crypto_challenge(&self) -> &CryptoChallengeUnion { - self.crypto_challenge.as_ref().unwrap_or_else(|| CryptoChallengeUnion::default_instance()) + self.crypto_challenge + .as_ref() + .unwrap_or_else(|| CryptoChallengeUnion::default_instance()) } pub fn clear_crypto_challenge(&mut self) { self.crypto_challenge.clear(); @@ -1875,12 +2082,13 @@ impl APChallenge { // Take field pub fn take_crypto_challenge(&mut self) -> CryptoChallengeUnion { - self.crypto_challenge.take().unwrap_or_else(|| CryptoChallengeUnion::new()) + self.crypto_challenge + .take() + .unwrap_or_else(|| CryptoChallengeUnion::new()) } // required bytes server_nonce = 50; - pub fn get_server_nonce(&self) -> &[u8] { match self.server_nonce.as_ref() { Some(v) => &v, @@ -1911,12 +2119,13 @@ impl APChallenge { // Take field pub fn take_server_nonce(&mut self) -> ::std::vec::Vec { - self.server_nonce.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.server_nonce + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bytes padding = 60; - pub fn get_padding(&self) -> &[u8] { match self.padding.as_ref() { Some(v) => &v, @@ -1947,7 +2156,9 @@ impl APChallenge { // Take field pub fn take_padding(&mut self) -> ::std::vec::Vec { - self.padding.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.padding + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -1972,50 +2183,78 @@ impl ::protobuf::Message for APChallenge { if !v.is_initialized() { return false; } - }; + } for v in &self.fingerprint_challenge { if !v.is_initialized() { return false; } - }; + } for v in &self.pow_challenge { if !v.is_initialized() { return false; } - }; + } for v in &self.crypto_challenge { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.login_crypto_challenge)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.login_crypto_challenge, + )?; + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.fingerprint_challenge)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.fingerprint_challenge, + )?; + } 30 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.pow_challenge)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.pow_challenge, + )?; + } 40 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.crypto_challenge)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.crypto_challenge, + )?; + } 50 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.server_nonce)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.server_nonce, + )?; + } 60 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.padding)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2052,7 +2291,10 @@ impl ::protobuf::Message for APChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.login_crypto_challenge.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2114,44 +2356,75 @@ impl ::protobuf::Message for APChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "login_crypto_challenge", - |m: &APChallenge| { &m.login_crypto_challenge }, - |m: &mut APChallenge| { &mut m.login_crypto_challenge }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "fingerprint_challenge", - |m: &APChallenge| { &m.fingerprint_challenge }, - |m: &mut APChallenge| { &mut m.fingerprint_challenge }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "pow_challenge", - |m: &APChallenge| { &m.pow_challenge }, - |m: &mut APChallenge| { &mut m.pow_challenge }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "crypto_challenge", - |m: &APChallenge| { &m.crypto_challenge }, - |m: &mut APChallenge| { &mut m.crypto_challenge }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "server_nonce", - |m: &APChallenge| { &m.server_nonce }, - |m: &mut APChallenge| { &mut m.server_nonce }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "padding", - |m: &APChallenge| { &m.padding }, - |m: &mut APChallenge| { &mut m.padding }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "login_crypto_challenge", + |m: &APChallenge| &m.login_crypto_challenge, + |m: &mut APChallenge| &mut m.login_crypto_challenge, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "fingerprint_challenge", + |m: &APChallenge| &m.fingerprint_challenge, + |m: &mut APChallenge| &mut m.fingerprint_challenge, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "pow_challenge", + |m: &APChallenge| &m.pow_challenge, + |m: &mut APChallenge| &mut m.pow_challenge, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "crypto_challenge", + |m: &APChallenge| &m.crypto_challenge, + |m: &mut APChallenge| &mut m.crypto_challenge, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "server_nonce", + |m: &APChallenge| &m.server_nonce, + |m: &mut APChallenge| &mut m.server_nonce, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "padding", + |m: &APChallenge| &m.padding, + |m: &mut APChallenge| &mut m.padding, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APChallenge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2159,9 +2432,7 @@ impl ::protobuf::Message for APChallenge { fn default_instance() -> &'static APChallenge { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(APChallenge::new) - } + unsafe { instance.get(APChallenge::new) } } } @@ -2189,7 +2460,7 @@ impl ::protobuf::reflect::ProtobufValue for APChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCryptoChallengeUnion { // message fields diffie_hellman: ::protobuf::SingularPtrField, @@ -2211,9 +2482,10 @@ impl LoginCryptoChallengeUnion { // optional .LoginCryptoDiffieHellmanChallenge diffie_hellman = 10; - pub fn get_diffie_hellman(&self) -> &LoginCryptoDiffieHellmanChallenge { - self.diffie_hellman.as_ref().unwrap_or_else(|| LoginCryptoDiffieHellmanChallenge::default_instance()) + self.diffie_hellman + .as_ref() + .unwrap_or_else(|| LoginCryptoDiffieHellmanChallenge::default_instance()) } pub fn clear_diffie_hellman(&mut self) { self.diffie_hellman.clear(); @@ -2239,7 +2511,9 @@ impl LoginCryptoChallengeUnion { // Take field pub fn take_diffie_hellman(&mut self) -> LoginCryptoDiffieHellmanChallenge { - self.diffie_hellman.take().unwrap_or_else(|| LoginCryptoDiffieHellmanChallenge::new()) + self.diffie_hellman + .take() + .unwrap_or_else(|| LoginCryptoDiffieHellmanChallenge::new()) } } @@ -2249,20 +2523,32 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.diffie_hellman)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.diffie_hellman, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2281,7 +2567,10 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.diffie_hellman.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2322,29 +2611,34 @@ impl ::protobuf::Message for LoginCryptoChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "diffie_hellman", - |m: &LoginCryptoChallengeUnion| { &m.diffie_hellman }, - |m: &mut LoginCryptoChallengeUnion| { &mut m.diffie_hellman }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "diffie_hellman", + |m: &LoginCryptoChallengeUnion| &m.diffie_hellman, + |m: &mut LoginCryptoChallengeUnion| &mut m.diffie_hellman, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoChallengeUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LoginCryptoChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCryptoChallengeUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCryptoChallengeUnion::new) } } } @@ -2367,7 +2661,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCryptoChallengeUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCryptoDiffieHellmanChallenge { // message fields gs: ::protobuf::SingularField<::std::vec::Vec>, @@ -2391,7 +2685,6 @@ impl LoginCryptoDiffieHellmanChallenge { // required bytes gs = 10; - pub fn get_gs(&self) -> &[u8] { match self.gs.as_ref() { Some(v) => &v, @@ -2427,7 +2720,6 @@ impl LoginCryptoDiffieHellmanChallenge { // required int32 server_signature_key = 20; - pub fn get_server_signature_key(&self) -> i32 { self.server_signature_key.unwrap_or(0) } @@ -2446,7 +2738,6 @@ impl LoginCryptoDiffieHellmanChallenge { // required bytes gs_signature = 30; - pub fn get_gs_signature(&self) -> &[u8] { match self.gs_signature.as_ref() { Some(v) => &v, @@ -2477,7 +2768,9 @@ impl LoginCryptoDiffieHellmanChallenge { // Take field pub fn take_gs_signature(&mut self) -> ::std::vec::Vec { - self.gs_signature.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.gs_signature + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -2495,26 +2788,40 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gs)?; - }, + } 20 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.server_signature_key = ::std::option::Option::Some(tmp); - }, + } 30 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gs_signature)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.gs_signature, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2538,7 +2845,10 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gs.as_ref() { os.write_bytes(10, &v)?; } @@ -2583,39 +2893,54 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gs", - |m: &LoginCryptoDiffieHellmanChallenge| { &m.gs }, - |m: &mut LoginCryptoDiffieHellmanChallenge| { &mut m.gs }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "gs", + |m: &LoginCryptoDiffieHellmanChallenge| &m.gs, + |m: &mut LoginCryptoDiffieHellmanChallenge| &mut m.gs, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "server_signature_key", - |m: &LoginCryptoDiffieHellmanChallenge| { &m.server_signature_key }, - |m: &mut LoginCryptoDiffieHellmanChallenge| { &mut m.server_signature_key }, + |m: &LoginCryptoDiffieHellmanChallenge| &m.server_signature_key, + |m: &mut LoginCryptoDiffieHellmanChallenge| &mut m.server_signature_key, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gs_signature", - |m: &LoginCryptoDiffieHellmanChallenge| { &m.gs_signature }, - |m: &mut LoginCryptoDiffieHellmanChallenge| { &mut m.gs_signature }, - )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "gs_signature", + |m: &LoginCryptoDiffieHellmanChallenge| &m.gs_signature, + |m: &mut LoginCryptoDiffieHellmanChallenge| &mut m.gs_signature, + ), + ); + ::protobuf::reflect::MessageDescriptor::new_pb_name::< + LoginCryptoDiffieHellmanChallenge, + >( "LoginCryptoDiffieHellmanChallenge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LoginCryptoDiffieHellmanChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCryptoDiffieHellmanChallenge::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCryptoDiffieHellmanChallenge::new) } } } @@ -2640,7 +2965,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FingerprintChallengeUnion { // message fields grain: ::protobuf::SingularPtrField, @@ -2663,9 +2988,10 @@ impl FingerprintChallengeUnion { // optional .FingerprintGrainChallenge grain = 10; - pub fn get_grain(&self) -> &FingerprintGrainChallenge { - self.grain.as_ref().unwrap_or_else(|| FingerprintGrainChallenge::default_instance()) + self.grain + .as_ref() + .unwrap_or_else(|| FingerprintGrainChallenge::default_instance()) } pub fn clear_grain(&mut self) { self.grain.clear(); @@ -2691,14 +3017,17 @@ impl FingerprintChallengeUnion { // Take field pub fn take_grain(&mut self) -> FingerprintGrainChallenge { - self.grain.take().unwrap_or_else(|| FingerprintGrainChallenge::new()) + self.grain + .take() + .unwrap_or_else(|| FingerprintGrainChallenge::new()) } // optional .FingerprintHmacRipemdChallenge hmac_ripemd = 20; - pub fn get_hmac_ripemd(&self) -> &FingerprintHmacRipemdChallenge { - self.hmac_ripemd.as_ref().unwrap_or_else(|| FingerprintHmacRipemdChallenge::default_instance()) + self.hmac_ripemd + .as_ref() + .unwrap_or_else(|| FingerprintHmacRipemdChallenge::default_instance()) } pub fn clear_hmac_ripemd(&mut self) { self.hmac_ripemd.clear(); @@ -2724,7 +3053,9 @@ impl FingerprintChallengeUnion { // Take field pub fn take_hmac_ripemd(&mut self) -> FingerprintHmacRipemdChallenge { - self.hmac_ripemd.take().unwrap_or_else(|| FingerprintHmacRipemdChallenge::new()) + self.hmac_ripemd + .take() + .unwrap_or_else(|| FingerprintHmacRipemdChallenge::new()) } } @@ -2734,28 +3065,40 @@ impl ::protobuf::Message for FingerprintChallengeUnion { if !v.is_initialized() { return false; } - }; + } for v in &self.hmac_ripemd { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.grain)?; - }, + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.hmac_ripemd)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.hmac_ripemd, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2778,7 +3121,10 @@ impl ::protobuf::Message for FingerprintChallengeUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.grain.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2824,34 +3170,44 @@ impl ::protobuf::Message for FingerprintChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "grain", - |m: &FingerprintChallengeUnion| { &m.grain }, - |m: &mut FingerprintChallengeUnion| { &mut m.grain }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "hmac_ripemd", - |m: &FingerprintChallengeUnion| { &m.hmac_ripemd }, - |m: &mut FingerprintChallengeUnion| { &mut m.hmac_ripemd }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "grain", + |m: &FingerprintChallengeUnion| &m.grain, + |m: &mut FingerprintChallengeUnion| &mut m.grain, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "hmac_ripemd", + |m: &FingerprintChallengeUnion| &m.hmac_ripemd, + |m: &mut FingerprintChallengeUnion| &mut m.hmac_ripemd, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintChallengeUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static FingerprintChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FingerprintChallengeUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(FingerprintChallengeUnion::new) } } } @@ -2875,7 +3231,7 @@ impl ::protobuf::reflect::ProtobufValue for FingerprintChallengeUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FingerprintGrainChallenge { // message fields kek: ::protobuf::SingularField<::std::vec::Vec>, @@ -2897,7 +3253,6 @@ impl FingerprintGrainChallenge { // required bytes kek = 10; - pub fn get_kek(&self) -> &[u8] { match self.kek.as_ref() { Some(v) => &v, @@ -2940,16 +3295,24 @@ impl ::protobuf::Message for FingerprintGrainChallenge { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.kek)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2967,7 +3330,10 @@ impl ::protobuf::Message for FingerprintGrainChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.kek.as_ref() { os.write_bytes(10, &v)?; } @@ -3006,29 +3372,34 @@ impl ::protobuf::Message for FingerprintGrainChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "kek", - |m: &FingerprintGrainChallenge| { &m.kek }, - |m: &mut FingerprintGrainChallenge| { &mut m.kek }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "kek", + |m: &FingerprintGrainChallenge| &m.kek, + |m: &mut FingerprintGrainChallenge| &mut m.kek, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "FingerprintGrainChallenge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static FingerprintGrainChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FingerprintGrainChallenge::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(FingerprintGrainChallenge::new) } } } @@ -3051,7 +3422,7 @@ impl ::protobuf::reflect::ProtobufValue for FingerprintGrainChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct FingerprintHmacRipemdChallenge { // message fields challenge: ::protobuf::SingularField<::std::vec::Vec>, @@ -3073,7 +3444,6 @@ impl FingerprintHmacRipemdChallenge { // required bytes challenge = 10; - pub fn get_challenge(&self) -> &[u8] { match self.challenge.as_ref() { Some(v) => &v, @@ -3104,7 +3474,9 @@ impl FingerprintHmacRipemdChallenge { // Take field pub fn take_challenge(&mut self) -> ::std::vec::Vec { - self.challenge.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.challenge + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -3116,16 +3488,24 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.challenge)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3143,7 +3523,10 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.challenge.as_ref() { os.write_bytes(10, &v)?; } @@ -3182,7 +3565,8 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); @@ -3201,10 +3585,9 @@ impl ::protobuf::Message for FingerprintHmacRipemdChallenge { } fn default_instance() -> &'static FingerprintHmacRipemdChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(FingerprintHmacRipemdChallenge::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(FingerprintHmacRipemdChallenge::new) } } } @@ -3227,7 +3610,7 @@ impl ::protobuf::reflect::ProtobufValue for FingerprintHmacRipemdChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PoWChallengeUnion { // message fields hash_cash: ::protobuf::SingularPtrField, @@ -3249,9 +3632,10 @@ impl PoWChallengeUnion { // optional .PoWHashCashChallenge hash_cash = 10; - pub fn get_hash_cash(&self) -> &PoWHashCashChallenge { - self.hash_cash.as_ref().unwrap_or_else(|| PoWHashCashChallenge::default_instance()) + self.hash_cash + .as_ref() + .unwrap_or_else(|| PoWHashCashChallenge::default_instance()) } pub fn clear_hash_cash(&mut self) { self.hash_cash.clear(); @@ -3277,7 +3661,9 @@ impl PoWChallengeUnion { // Take field pub fn take_hash_cash(&mut self) -> PoWHashCashChallenge { - self.hash_cash.take().unwrap_or_else(|| PoWHashCashChallenge::new()) + self.hash_cash + .take() + .unwrap_or_else(|| PoWHashCashChallenge::new()) } } @@ -3287,20 +3673,28 @@ impl ::protobuf::Message for PoWChallengeUnion { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.hash_cash)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3319,7 +3713,10 @@ impl ::protobuf::Message for PoWChallengeUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.hash_cash.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -3360,29 +3757,34 @@ impl ::protobuf::Message for PoWChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "hash_cash", - |m: &PoWChallengeUnion| { &m.hash_cash }, - |m: &mut PoWChallengeUnion| { &mut m.hash_cash }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "hash_cash", + |m: &PoWChallengeUnion| &m.hash_cash, + |m: &mut PoWChallengeUnion| &mut m.hash_cash, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWChallengeUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static PoWChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PoWChallengeUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(PoWChallengeUnion::new) } } } @@ -3405,7 +3807,7 @@ impl ::protobuf::reflect::ProtobufValue for PoWChallengeUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PoWHashCashChallenge { // message fields prefix: ::protobuf::SingularField<::std::vec::Vec>, @@ -3429,7 +3831,6 @@ impl PoWHashCashChallenge { // optional bytes prefix = 10; - pub fn get_prefix(&self) -> &[u8] { match self.prefix.as_ref() { Some(v) => &v, @@ -3465,7 +3866,6 @@ impl PoWHashCashChallenge { // optional int32 length = 20; - pub fn get_length(&self) -> i32 { self.length.unwrap_or(0) } @@ -3484,7 +3884,6 @@ impl PoWHashCashChallenge { // optional int32 target = 30; - pub fn get_target(&self) -> i32 { self.target.unwrap_or(0) } @@ -3507,30 +3906,42 @@ impl ::protobuf::Message for PoWHashCashChallenge { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.prefix)?; - }, + } 20 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.length = ::std::option::Option::Some(tmp); - }, + } 30 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.target = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3554,7 +3965,10 @@ impl ::protobuf::Message for PoWHashCashChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.prefix.as_ref() { os.write_bytes(10, &v)?; } @@ -3599,39 +4013,50 @@ impl ::protobuf::Message for PoWHashCashChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "prefix", - |m: &PoWHashCashChallenge| { &m.prefix }, - |m: &mut PoWHashCashChallenge| { &mut m.prefix }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "prefix", + |m: &PoWHashCashChallenge| &m.prefix, + |m: &mut PoWHashCashChallenge| &mut m.prefix, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "length", - |m: &PoWHashCashChallenge| { &m.length }, - |m: &mut PoWHashCashChallenge| { &mut m.length }, + |m: &PoWHashCashChallenge| &m.length, + |m: &mut PoWHashCashChallenge| &mut m.length, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "target", - |m: &PoWHashCashChallenge| { &m.target }, - |m: &mut PoWHashCashChallenge| { &mut m.target }, + |m: &PoWHashCashChallenge| &m.target, + |m: &mut PoWHashCashChallenge| &mut m.target, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWHashCashChallenge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static PoWHashCashChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PoWHashCashChallenge::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(PoWHashCashChallenge::new) } } } @@ -3656,7 +4081,7 @@ impl ::protobuf::reflect::ProtobufValue for PoWHashCashChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct CryptoChallengeUnion { // message fields shannon: ::protobuf::SingularPtrField, @@ -3679,9 +4104,10 @@ impl CryptoChallengeUnion { // optional .CryptoShannonChallenge shannon = 10; - pub fn get_shannon(&self) -> &CryptoShannonChallenge { - self.shannon.as_ref().unwrap_or_else(|| CryptoShannonChallenge::default_instance()) + self.shannon + .as_ref() + .unwrap_or_else(|| CryptoShannonChallenge::default_instance()) } pub fn clear_shannon(&mut self) { self.shannon.clear(); @@ -3707,14 +4133,17 @@ impl CryptoChallengeUnion { // Take field pub fn take_shannon(&mut self) -> CryptoShannonChallenge { - self.shannon.take().unwrap_or_else(|| CryptoShannonChallenge::new()) + self.shannon + .take() + .unwrap_or_else(|| CryptoShannonChallenge::new()) } // optional .CryptoRc4Sha1HmacChallenge rc4_sha1_hmac = 20; - pub fn get_rc4_sha1_hmac(&self) -> &CryptoRc4Sha1HmacChallenge { - self.rc4_sha1_hmac.as_ref().unwrap_or_else(|| CryptoRc4Sha1HmacChallenge::default_instance()) + self.rc4_sha1_hmac + .as_ref() + .unwrap_or_else(|| CryptoRc4Sha1HmacChallenge::default_instance()) } pub fn clear_rc4_sha1_hmac(&mut self) { self.rc4_sha1_hmac.clear(); @@ -3740,7 +4169,9 @@ impl CryptoChallengeUnion { // Take field pub fn take_rc4_sha1_hmac(&mut self) -> CryptoRc4Sha1HmacChallenge { - self.rc4_sha1_hmac.take().unwrap_or_else(|| CryptoRc4Sha1HmacChallenge::new()) + self.rc4_sha1_hmac + .take() + .unwrap_or_else(|| CryptoRc4Sha1HmacChallenge::new()) } } @@ -3750,28 +4181,40 @@ impl ::protobuf::Message for CryptoChallengeUnion { if !v.is_initialized() { return false; } - }; + } for v in &self.rc4_sha1_hmac { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.shannon)?; - }, + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.rc4_sha1_hmac)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.rc4_sha1_hmac, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3794,7 +4237,10 @@ impl ::protobuf::Message for CryptoChallengeUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.shannon.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -3840,34 +4286,44 @@ impl ::protobuf::Message for CryptoChallengeUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "shannon", - |m: &CryptoChallengeUnion| { &m.shannon }, - |m: &mut CryptoChallengeUnion| { &mut m.shannon }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "rc4_sha1_hmac", - |m: &CryptoChallengeUnion| { &m.rc4_sha1_hmac }, - |m: &mut CryptoChallengeUnion| { &mut m.rc4_sha1_hmac }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "shannon", + |m: &CryptoChallengeUnion| &m.shannon, + |m: &mut CryptoChallengeUnion| &mut m.shannon, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "rc4_sha1_hmac", + |m: &CryptoChallengeUnion| &m.rc4_sha1_hmac, + |m: &mut CryptoChallengeUnion| &mut m.rc4_sha1_hmac, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoChallengeUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static CryptoChallengeUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(CryptoChallengeUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(CryptoChallengeUnion::new) } } } @@ -3891,7 +4347,7 @@ impl ::protobuf::reflect::ProtobufValue for CryptoChallengeUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct CryptoShannonChallenge { // special fields pub unknown_fields: ::protobuf::UnknownFields, @@ -3915,13 +4371,21 @@ impl ::protobuf::Message for CryptoShannonChallenge { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3936,7 +4400,10 @@ impl ::protobuf::Message for CryptoShannonChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3972,24 +4439,24 @@ impl ::protobuf::Message for CryptoShannonChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoShannonChallenge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static CryptoShannonChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(CryptoShannonChallenge::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(CryptoShannonChallenge::new) } } } @@ -4011,7 +4478,7 @@ impl ::protobuf::reflect::ProtobufValue for CryptoShannonChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct CryptoRc4Sha1HmacChallenge { // special fields pub unknown_fields: ::protobuf::UnknownFields, @@ -4035,13 +4502,21 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4056,7 +4531,10 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4092,24 +4570,24 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacChallenge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let fields = ::std::vec::Vec::new(); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoRc4Sha1HmacChallenge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static CryptoRc4Sha1HmacChallenge { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(CryptoRc4Sha1HmacChallenge::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(CryptoRc4Sha1HmacChallenge::new) } } } @@ -4131,7 +4609,7 @@ impl ::protobuf::reflect::ProtobufValue for CryptoRc4Sha1HmacChallenge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct UpgradeRequiredMessage { // message fields upgrade_signed_part: ::protobuf::SingularField<::std::vec::Vec>, @@ -4155,7 +4633,6 @@ impl UpgradeRequiredMessage { // required bytes upgrade_signed_part = 10; - pub fn get_upgrade_signed_part(&self) -> &[u8] { match self.upgrade_signed_part.as_ref() { Some(v) => &v, @@ -4186,12 +4663,13 @@ impl UpgradeRequiredMessage { // Take field pub fn take_upgrade_signed_part(&mut self) -> ::std::vec::Vec { - self.upgrade_signed_part.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.upgrade_signed_part + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // required bytes signature = 20; - pub fn get_signature(&self) -> &[u8] { match self.signature.as_ref() { Some(v) => &v, @@ -4222,12 +4700,13 @@ impl UpgradeRequiredMessage { // Take field pub fn take_signature(&mut self) -> ::std::vec::Vec { - self.signature.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.signature + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional string http_suffix = 30; - pub fn get_http_suffix(&self) -> &str { match self.http_suffix.as_ref() { Some(v) => &v, @@ -4258,7 +4737,9 @@ impl UpgradeRequiredMessage { // Take field pub fn take_http_suffix(&mut self) -> ::std::string::String { - self.http_suffix.take().unwrap_or_else(|| ::std::string::String::new()) + self.http_suffix + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -4273,22 +4754,38 @@ impl ::protobuf::Message for UpgradeRequiredMessage { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.upgrade_signed_part)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.upgrade_signed_part, + )?; + } 20 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.signature)?; - }, + } 30 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.http_suffix)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.http_suffix, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4312,7 +4809,10 @@ impl ::protobuf::Message for UpgradeRequiredMessage { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.upgrade_signed_part.as_ref() { os.write_bytes(10, &v)?; } @@ -4357,39 +4857,54 @@ impl ::protobuf::Message for UpgradeRequiredMessage { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "upgrade_signed_part", - |m: &UpgradeRequiredMessage| { &m.upgrade_signed_part }, - |m: &mut UpgradeRequiredMessage| { &mut m.upgrade_signed_part }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "signature", - |m: &UpgradeRequiredMessage| { &m.signature }, - |m: &mut UpgradeRequiredMessage| { &mut m.signature }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "http_suffix", - |m: &UpgradeRequiredMessage| { &m.http_suffix }, - |m: &mut UpgradeRequiredMessage| { &mut m.http_suffix }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "upgrade_signed_part", + |m: &UpgradeRequiredMessage| &m.upgrade_signed_part, + |m: &mut UpgradeRequiredMessage| &mut m.upgrade_signed_part, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "signature", + |m: &UpgradeRequiredMessage| &m.signature, + |m: &mut UpgradeRequiredMessage| &mut m.signature, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "http_suffix", + |m: &UpgradeRequiredMessage| &m.http_suffix, + |m: &mut UpgradeRequiredMessage| &mut m.http_suffix, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UpgradeRequiredMessage", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static UpgradeRequiredMessage { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(UpgradeRequiredMessage::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(UpgradeRequiredMessage::new) } } } @@ -4414,7 +4929,7 @@ impl ::protobuf::reflect::ProtobufValue for UpgradeRequiredMessage { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct APLoginFailed { // message fields error_code: ::std::option::Option, @@ -4439,7 +4954,6 @@ impl APLoginFailed { // required .ErrorCode error_code = 10; - pub fn get_error_code(&self) -> ErrorCode { self.error_code.unwrap_or(ErrorCode::ProtocolError) } @@ -4458,7 +4972,6 @@ impl APLoginFailed { // optional int32 retry_delay = 20; - pub fn get_retry_delay(&self) -> i32 { self.retry_delay.unwrap_or(0) } @@ -4477,7 +4990,6 @@ impl APLoginFailed { // optional int32 expiry = 30; - pub fn get_expiry(&self) -> i32 { self.expiry.unwrap_or(0) } @@ -4496,7 +5008,6 @@ impl APLoginFailed { // optional string error_description = 40; - pub fn get_error_description(&self) -> &str { match self.error_description.as_ref() { Some(v) => &v, @@ -4527,7 +5038,9 @@ impl APLoginFailed { // Take field pub fn take_error_description(&mut self) -> ::std::string::String { - self.error_description.take().unwrap_or_else(|| ::std::string::String::new()) + self.error_description + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -4539,33 +5052,53 @@ impl ::protobuf::Message for APLoginFailed { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 10 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.error_code, 10, &mut self.unknown_fields)? - }, + 10 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.error_code, + 10, + &mut self.unknown_fields, + )?, 20 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.retry_delay = ::std::option::Option::Some(tmp); - }, + } 30 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.expiry = ::std::option::Option::Some(tmp); - }, + } 40 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.error_description)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.error_description, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4592,7 +5125,10 @@ impl ::protobuf::Message for APLoginFailed { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.error_code { os.write_enum(10, v.value())?; } @@ -4640,34 +5176,49 @@ impl ::protobuf::Message for APLoginFailed { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "error_code", - |m: &APLoginFailed| { &m.error_code }, - |m: &mut APLoginFailed| { &mut m.error_code }, + |m: &APLoginFailed| &m.error_code, + |m: &mut APLoginFailed| &mut m.error_code, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "retry_delay", - |m: &APLoginFailed| { &m.retry_delay }, - |m: &mut APLoginFailed| { &mut m.retry_delay }, + |m: &APLoginFailed| &m.retry_delay, + |m: &mut APLoginFailed| &mut m.retry_delay, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "expiry", - |m: &APLoginFailed| { &m.expiry }, - |m: &mut APLoginFailed| { &mut m.expiry }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "error_description", - |m: &APLoginFailed| { &m.error_description }, - |m: &mut APLoginFailed| { &mut m.error_description }, + |m: &APLoginFailed| &m.expiry, + |m: &mut APLoginFailed| &mut m.expiry, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "error_description", + |m: &APLoginFailed| &m.error_description, + |m: &mut APLoginFailed| &mut m.error_description, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "APLoginFailed", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -4675,9 +5226,7 @@ impl ::protobuf::Message for APLoginFailed { fn default_instance() -> &'static APLoginFailed { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(APLoginFailed::new) - } + unsafe { instance.get(APLoginFailed::new) } } } @@ -4703,7 +5252,7 @@ impl ::protobuf::reflect::ProtobufValue for APLoginFailed { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientResponsePlaintext { // message fields login_crypto_response: ::protobuf::SingularPtrField, @@ -4727,9 +5276,10 @@ impl ClientResponsePlaintext { // required .LoginCryptoResponseUnion login_crypto_response = 10; - pub fn get_login_crypto_response(&self) -> &LoginCryptoResponseUnion { - self.login_crypto_response.as_ref().unwrap_or_else(|| LoginCryptoResponseUnion::default_instance()) + self.login_crypto_response + .as_ref() + .unwrap_or_else(|| LoginCryptoResponseUnion::default_instance()) } pub fn clear_login_crypto_response(&mut self) { self.login_crypto_response.clear(); @@ -4755,14 +5305,17 @@ impl ClientResponsePlaintext { // Take field pub fn take_login_crypto_response(&mut self) -> LoginCryptoResponseUnion { - self.login_crypto_response.take().unwrap_or_else(|| LoginCryptoResponseUnion::new()) + self.login_crypto_response + .take() + .unwrap_or_else(|| LoginCryptoResponseUnion::new()) } // required .PoWResponseUnion pow_response = 20; - pub fn get_pow_response(&self) -> &PoWResponseUnion { - self.pow_response.as_ref().unwrap_or_else(|| PoWResponseUnion::default_instance()) + self.pow_response + .as_ref() + .unwrap_or_else(|| PoWResponseUnion::default_instance()) } pub fn clear_pow_response(&mut self) { self.pow_response.clear(); @@ -4788,14 +5341,17 @@ impl ClientResponsePlaintext { // Take field pub fn take_pow_response(&mut self) -> PoWResponseUnion { - self.pow_response.take().unwrap_or_else(|| PoWResponseUnion::new()) + self.pow_response + .take() + .unwrap_or_else(|| PoWResponseUnion::new()) } // required .CryptoResponseUnion crypto_response = 30; - pub fn get_crypto_response(&self) -> &CryptoResponseUnion { - self.crypto_response.as_ref().unwrap_or_else(|| CryptoResponseUnion::default_instance()) + self.crypto_response + .as_ref() + .unwrap_or_else(|| CryptoResponseUnion::default_instance()) } pub fn clear_crypto_response(&mut self) { self.crypto_response.clear(); @@ -4821,7 +5377,9 @@ impl ClientResponsePlaintext { // Take field pub fn take_crypto_response(&mut self) -> CryptoResponseUnion { - self.crypto_response.take().unwrap_or_else(|| CryptoResponseUnion::new()) + self.crypto_response + .take() + .unwrap_or_else(|| CryptoResponseUnion::new()) } } @@ -4840,36 +5398,56 @@ impl ::protobuf::Message for ClientResponsePlaintext { if !v.is_initialized() { return false; } - }; + } for v in &self.pow_response { if !v.is_initialized() { return false; } - }; + } for v in &self.crypto_response { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.login_crypto_response)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.login_crypto_response, + )?; + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.pow_response)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.pow_response, + )?; + } 30 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.crypto_response)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.crypto_response, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4896,7 +5474,10 @@ impl ::protobuf::Message for ClientResponsePlaintext { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.login_crypto_response.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -4947,39 +5528,54 @@ impl ::protobuf::Message for ClientResponsePlaintext { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "login_crypto_response", - |m: &ClientResponsePlaintext| { &m.login_crypto_response }, - |m: &mut ClientResponsePlaintext| { &mut m.login_crypto_response }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "pow_response", - |m: &ClientResponsePlaintext| { &m.pow_response }, - |m: &mut ClientResponsePlaintext| { &mut m.pow_response }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "crypto_response", - |m: &ClientResponsePlaintext| { &m.crypto_response }, - |m: &mut ClientResponsePlaintext| { &mut m.crypto_response }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "login_crypto_response", + |m: &ClientResponsePlaintext| &m.login_crypto_response, + |m: &mut ClientResponsePlaintext| &mut m.login_crypto_response, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "pow_response", + |m: &ClientResponsePlaintext| &m.pow_response, + |m: &mut ClientResponsePlaintext| &mut m.pow_response, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "crypto_response", + |m: &ClientResponsePlaintext| &m.crypto_response, + |m: &mut ClientResponsePlaintext| &mut m.crypto_response, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientResponsePlaintext", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ClientResponsePlaintext { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientResponsePlaintext::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ClientResponsePlaintext::new) } } } @@ -5004,7 +5600,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientResponsePlaintext { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCryptoResponseUnion { // message fields diffie_hellman: ::protobuf::SingularPtrField, @@ -5026,9 +5622,10 @@ impl LoginCryptoResponseUnion { // optional .LoginCryptoDiffieHellmanResponse diffie_hellman = 10; - pub fn get_diffie_hellman(&self) -> &LoginCryptoDiffieHellmanResponse { - self.diffie_hellman.as_ref().unwrap_or_else(|| LoginCryptoDiffieHellmanResponse::default_instance()) + self.diffie_hellman + .as_ref() + .unwrap_or_else(|| LoginCryptoDiffieHellmanResponse::default_instance()) } pub fn clear_diffie_hellman(&mut self) { self.diffie_hellman.clear(); @@ -5054,7 +5651,9 @@ impl LoginCryptoResponseUnion { // Take field pub fn take_diffie_hellman(&mut self) -> LoginCryptoDiffieHellmanResponse { - self.diffie_hellman.take().unwrap_or_else(|| LoginCryptoDiffieHellmanResponse::new()) + self.diffie_hellman + .take() + .unwrap_or_else(|| LoginCryptoDiffieHellmanResponse::new()) } } @@ -5064,20 +5663,32 @@ impl ::protobuf::Message for LoginCryptoResponseUnion { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.diffie_hellman)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.diffie_hellman, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5096,7 +5707,10 @@ impl ::protobuf::Message for LoginCryptoResponseUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.diffie_hellman.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5137,29 +5751,34 @@ impl ::protobuf::Message for LoginCryptoResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "diffie_hellman", - |m: &LoginCryptoResponseUnion| { &m.diffie_hellman }, - |m: &mut LoginCryptoResponseUnion| { &mut m.diffie_hellman }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "diffie_hellman", + |m: &LoginCryptoResponseUnion| &m.diffie_hellman, + |m: &mut LoginCryptoResponseUnion| &mut m.diffie_hellman, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "LoginCryptoResponseUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LoginCryptoResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCryptoResponseUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCryptoResponseUnion::new) } } } @@ -5182,7 +5801,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCryptoResponseUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct LoginCryptoDiffieHellmanResponse { // message fields hmac: ::protobuf::SingularField<::std::vec::Vec>, @@ -5204,7 +5823,6 @@ impl LoginCryptoDiffieHellmanResponse { // required bytes hmac = 10; - pub fn get_hmac(&self) -> &[u8] { match self.hmac.as_ref() { Some(v) => &v, @@ -5247,16 +5865,24 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.hmac)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5274,7 +5900,10 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.hmac.as_ref() { os.write_bytes(10, &v)?; } @@ -5313,29 +5942,36 @@ impl ::protobuf::Message for LoginCryptoDiffieHellmanResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "hmac", - |m: &LoginCryptoDiffieHellmanResponse| { &m.hmac }, - |m: &mut LoginCryptoDiffieHellmanResponse| { &mut m.hmac }, - )); - ::protobuf::reflect::MessageDescriptor::new_pb_name::( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "hmac", + |m: &LoginCryptoDiffieHellmanResponse| &m.hmac, + |m: &mut LoginCryptoDiffieHellmanResponse| &mut m.hmac, + ), + ); + ::protobuf::reflect::MessageDescriptor::new_pb_name::< + LoginCryptoDiffieHellmanResponse, + >( "LoginCryptoDiffieHellmanResponse", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static LoginCryptoDiffieHellmanResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(LoginCryptoDiffieHellmanResponse::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(LoginCryptoDiffieHellmanResponse::new) } } } @@ -5358,7 +5994,7 @@ impl ::protobuf::reflect::ProtobufValue for LoginCryptoDiffieHellmanResponse { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PoWResponseUnion { // message fields hash_cash: ::protobuf::SingularPtrField, @@ -5380,9 +6016,10 @@ impl PoWResponseUnion { // optional .PoWHashCashResponse hash_cash = 10; - pub fn get_hash_cash(&self) -> &PoWHashCashResponse { - self.hash_cash.as_ref().unwrap_or_else(|| PoWHashCashResponse::default_instance()) + self.hash_cash + .as_ref() + .unwrap_or_else(|| PoWHashCashResponse::default_instance()) } pub fn clear_hash_cash(&mut self) { self.hash_cash.clear(); @@ -5408,7 +6045,9 @@ impl PoWResponseUnion { // Take field pub fn take_hash_cash(&mut self) -> PoWHashCashResponse { - self.hash_cash.take().unwrap_or_else(|| PoWHashCashResponse::new()) + self.hash_cash + .take() + .unwrap_or_else(|| PoWHashCashResponse::new()) } } @@ -5418,20 +6057,28 @@ impl ::protobuf::Message for PoWResponseUnion { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.hash_cash)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5450,7 +6097,10 @@ impl ::protobuf::Message for PoWResponseUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.hash_cash.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5491,29 +6141,34 @@ impl ::protobuf::Message for PoWResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "hash_cash", - |m: &PoWResponseUnion| { &m.hash_cash }, - |m: &mut PoWResponseUnion| { &mut m.hash_cash }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "hash_cash", + |m: &PoWResponseUnion| &m.hash_cash, + |m: &mut PoWResponseUnion| &mut m.hash_cash, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWResponseUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static PoWResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PoWResponseUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(PoWResponseUnion::new) } } } @@ -5536,7 +6191,7 @@ impl ::protobuf::reflect::ProtobufValue for PoWResponseUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct PoWHashCashResponse { // message fields hash_suffix: ::protobuf::SingularField<::std::vec::Vec>, @@ -5558,7 +6213,6 @@ impl PoWHashCashResponse { // required bytes hash_suffix = 10; - pub fn get_hash_suffix(&self) -> &[u8] { match self.hash_suffix.as_ref() { Some(v) => &v, @@ -5589,7 +6243,9 @@ impl PoWHashCashResponse { // Take field pub fn take_hash_suffix(&mut self) -> ::std::vec::Vec { - self.hash_suffix.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.hash_suffix + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -5601,16 +6257,24 @@ impl ::protobuf::Message for PoWHashCashResponse { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.hash_suffix)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5628,7 +6292,10 @@ impl ::protobuf::Message for PoWHashCashResponse { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.hash_suffix.as_ref() { os.write_bytes(10, &v)?; } @@ -5667,29 +6334,34 @@ impl ::protobuf::Message for PoWHashCashResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "hash_suffix", - |m: &PoWHashCashResponse| { &m.hash_suffix }, - |m: &mut PoWHashCashResponse| { &mut m.hash_suffix }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "hash_suffix", + |m: &PoWHashCashResponse| &m.hash_suffix, + |m: &mut PoWHashCashResponse| &mut m.hash_suffix, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "PoWHashCashResponse", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static PoWHashCashResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(PoWHashCashResponse::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(PoWHashCashResponse::new) } } } @@ -5712,7 +6384,7 @@ impl ::protobuf::reflect::ProtobufValue for PoWHashCashResponse { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct CryptoResponseUnion { // message fields shannon: ::protobuf::SingularPtrField, @@ -5735,9 +6407,10 @@ impl CryptoResponseUnion { // optional .CryptoShannonResponse shannon = 10; - pub fn get_shannon(&self) -> &CryptoShannonResponse { - self.shannon.as_ref().unwrap_or_else(|| CryptoShannonResponse::default_instance()) + self.shannon + .as_ref() + .unwrap_or_else(|| CryptoShannonResponse::default_instance()) } pub fn clear_shannon(&mut self) { self.shannon.clear(); @@ -5763,14 +6436,17 @@ impl CryptoResponseUnion { // Take field pub fn take_shannon(&mut self) -> CryptoShannonResponse { - self.shannon.take().unwrap_or_else(|| CryptoShannonResponse::new()) + self.shannon + .take() + .unwrap_or_else(|| CryptoShannonResponse::new()) } // optional .CryptoRc4Sha1HmacResponse rc4_sha1_hmac = 20; - pub fn get_rc4_sha1_hmac(&self) -> &CryptoRc4Sha1HmacResponse { - self.rc4_sha1_hmac.as_ref().unwrap_or_else(|| CryptoRc4Sha1HmacResponse::default_instance()) + self.rc4_sha1_hmac + .as_ref() + .unwrap_or_else(|| CryptoRc4Sha1HmacResponse::default_instance()) } pub fn clear_rc4_sha1_hmac(&mut self) { self.rc4_sha1_hmac.clear(); @@ -5796,7 +6472,9 @@ impl CryptoResponseUnion { // Take field pub fn take_rc4_sha1_hmac(&mut self) -> CryptoRc4Sha1HmacResponse { - self.rc4_sha1_hmac.take().unwrap_or_else(|| CryptoRc4Sha1HmacResponse::new()) + self.rc4_sha1_hmac + .take() + .unwrap_or_else(|| CryptoRc4Sha1HmacResponse::new()) } } @@ -5806,28 +6484,40 @@ impl ::protobuf::Message for CryptoResponseUnion { if !v.is_initialized() { return false; } - }; + } for v in &self.rc4_sha1_hmac { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 10 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.shannon)?; - }, + } 20 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.rc4_sha1_hmac)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.rc4_sha1_hmac, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5850,7 +6540,10 @@ impl ::protobuf::Message for CryptoResponseUnion { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.shannon.as_ref() { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5896,34 +6589,44 @@ impl ::protobuf::Message for CryptoResponseUnion { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "shannon", - |m: &CryptoResponseUnion| { &m.shannon }, - |m: &mut CryptoResponseUnion| { &mut m.shannon }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "rc4_sha1_hmac", - |m: &CryptoResponseUnion| { &m.rc4_sha1_hmac }, - |m: &mut CryptoResponseUnion| { &mut m.rc4_sha1_hmac }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "shannon", + |m: &CryptoResponseUnion| &m.shannon, + |m: &mut CryptoResponseUnion| &mut m.shannon, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "rc4_sha1_hmac", + |m: &CryptoResponseUnion| &m.rc4_sha1_hmac, + |m: &mut CryptoResponseUnion| &mut m.rc4_sha1_hmac, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoResponseUnion", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static CryptoResponseUnion { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(CryptoResponseUnion::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(CryptoResponseUnion::new) } } } @@ -5947,7 +6650,7 @@ impl ::protobuf::reflect::ProtobufValue for CryptoResponseUnion { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct CryptoShannonResponse { // message fields dummy: ::std::option::Option, @@ -5969,7 +6672,6 @@ impl CryptoShannonResponse { // optional int32 dummy = 1; - pub fn get_dummy(&self) -> i32 { self.dummy.unwrap_or(0) } @@ -5992,20 +6694,30 @@ impl ::protobuf::Message for CryptoShannonResponse { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.dummy = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -6023,7 +6735,10 @@ impl ::protobuf::Message for CryptoShannonResponse { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.dummy { os.write_int32(1, v)?; } @@ -6062,29 +6777,32 @@ impl ::protobuf::Message for CryptoShannonResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "dummy", - |m: &CryptoShannonResponse| { &m.dummy }, - |m: &mut CryptoShannonResponse| { &mut m.dummy }, + |m: &CryptoShannonResponse| &m.dummy, + |m: &mut CryptoShannonResponse| &mut m.dummy, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoShannonResponse", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static CryptoShannonResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(CryptoShannonResponse::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(CryptoShannonResponse::new) } } } @@ -6107,7 +6825,7 @@ impl ::protobuf::reflect::ProtobufValue for CryptoShannonResponse { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct CryptoRc4Sha1HmacResponse { // message fields dummy: ::std::option::Option, @@ -6129,7 +6847,6 @@ impl CryptoRc4Sha1HmacResponse { // optional int32 dummy = 1; - pub fn get_dummy(&self) -> i32 { self.dummy.unwrap_or(0) } @@ -6152,20 +6869,30 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.dummy = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -6183,7 +6910,10 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.dummy { os.write_int32(1, v)?; } @@ -6222,29 +6952,32 @@ impl ::protobuf::Message for CryptoRc4Sha1HmacResponse { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "dummy", - |m: &CryptoRc4Sha1HmacResponse| { &m.dummy }, - |m: &mut CryptoRc4Sha1HmacResponse| { &mut m.dummy }, + |m: &CryptoRc4Sha1HmacResponse| &m.dummy, + |m: &mut CryptoRc4Sha1HmacResponse| &mut m.dummy, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "CryptoRc4Sha1HmacResponse", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static CryptoRc4Sha1HmacResponse { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(CryptoRc4Sha1HmacResponse::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(CryptoRc4Sha1HmacResponse::new) } } } @@ -6267,7 +7000,7 @@ impl ::protobuf::reflect::ProtobufValue for CryptoRc4Sha1HmacResponse { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Product { PRODUCT_CLIENT = 0, PRODUCT_LIBSPOTIFY = 1, @@ -6288,7 +7021,7 @@ impl ::protobuf::ProtobufEnum for Product { 2 => ::std::option::Option::Some(Product::PRODUCT_MOBILE), 3 => ::std::option::Option::Some(Product::PRODUCT_PARTNER), 5 => ::std::option::Option::Some(Product::PRODUCT_LIBSPOTIFY_EMBEDDED), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6304,17 +7037,20 @@ impl ::protobuf::ProtobufEnum for Product { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Product", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Product", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Product { -} +impl ::std::marker::Copy for Product {} impl ::std::default::Default for Product { fn default() -> Self { @@ -6328,7 +7064,7 @@ impl ::protobuf::reflect::ProtobufValue for Product { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ProductFlags { PRODUCT_FLAG_NONE = 0, PRODUCT_FLAG_DEV_BUILD = 1, @@ -6343,7 +7079,7 @@ impl ::protobuf::ProtobufEnum for ProductFlags { match value { 0 => ::std::option::Option::Some(ProductFlags::PRODUCT_FLAG_NONE), 1 => ::std::option::Option::Some(ProductFlags::PRODUCT_FLAG_DEV_BUILD), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6356,17 +7092,20 @@ impl ::protobuf::ProtobufEnum for ProductFlags { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ProductFlags", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ProductFlags", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ProductFlags { -} +impl ::std::marker::Copy for ProductFlags {} impl ::std::default::Default for ProductFlags { fn default() -> Self { @@ -6380,7 +7119,7 @@ impl ::protobuf::reflect::ProtobufValue for ProductFlags { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Platform { PLATFORM_WIN32_X86 = 0, PLATFORM_OSX_X86 = 1, @@ -6439,7 +7178,7 @@ impl ::protobuf::ProtobufEnum for Platform { 21 => ::std::option::Option::Some(Platform::PLATFORM_ONKYO_ARM), 22 => ::std::option::Option::Some(Platform::PLATFORM_QNXNTO_ARM), 23 => ::std::option::Option::Some(Platform::PLATFORM_BCO_ARM), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6474,17 +7213,20 @@ impl ::protobuf::ProtobufEnum for Platform { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Platform", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Platform", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Platform { -} +impl ::std::marker::Copy for Platform {} impl ::std::default::Default for Platform { fn default() -> Self { @@ -6498,7 +7240,7 @@ impl ::protobuf::reflect::ProtobufValue for Platform { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Fingerprint { FINGERPRINT_GRAIN = 0, FINGERPRINT_HMAC_RIPEMD = 1, @@ -6513,7 +7255,7 @@ impl ::protobuf::ProtobufEnum for Fingerprint { match value { 0 => ::std::option::Option::Some(Fingerprint::FINGERPRINT_GRAIN), 1 => ::std::option::Option::Some(Fingerprint::FINGERPRINT_HMAC_RIPEMD), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6526,17 +7268,20 @@ impl ::protobuf::ProtobufEnum for Fingerprint { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Fingerprint", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Fingerprint", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Fingerprint { -} +impl ::std::marker::Copy for Fingerprint {} impl ::std::default::Default for Fingerprint { fn default() -> Self { @@ -6550,7 +7295,7 @@ impl ::protobuf::reflect::ProtobufValue for Fingerprint { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Cryptosuite { CRYPTO_SUITE_SHANNON = 0, CRYPTO_SUITE_RC4_SHA1_HMAC = 1, @@ -6565,7 +7310,7 @@ impl ::protobuf::ProtobufEnum for Cryptosuite { match value { 0 => ::std::option::Option::Some(Cryptosuite::CRYPTO_SUITE_SHANNON), 1 => ::std::option::Option::Some(Cryptosuite::CRYPTO_SUITE_RC4_SHA1_HMAC), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6578,17 +7323,20 @@ impl ::protobuf::ProtobufEnum for Cryptosuite { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Cryptosuite", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Cryptosuite", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Cryptosuite { -} +impl ::std::marker::Copy for Cryptosuite {} impl ::std::default::Default for Cryptosuite { fn default() -> Self { @@ -6602,7 +7350,7 @@ impl ::protobuf::reflect::ProtobufValue for Cryptosuite { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Powscheme { POW_HASH_CASH = 0, } @@ -6615,29 +7363,30 @@ impl ::protobuf::ProtobufEnum for Powscheme { fn from_i32(value: i32) -> ::std::option::Option { match value { 0 => ::std::option::Option::Some(Powscheme::POW_HASH_CASH), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } fn values() -> &'static [Self] { - static values: &'static [Powscheme] = &[ - Powscheme::POW_HASH_CASH, - ]; + static values: &'static [Powscheme] = &[Powscheme::POW_HASH_CASH]; values } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Powscheme", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Powscheme", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Powscheme { -} +impl ::std::marker::Copy for Powscheme {} impl ::std::default::Default for Powscheme { fn default() -> Self { @@ -6651,7 +7400,7 @@ impl ::protobuf::reflect::ProtobufValue for Powscheme { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ErrorCode { ProtocolError = 0, TryAnotherAP = 2, @@ -6684,7 +7433,7 @@ impl ::protobuf::ProtobufEnum for ErrorCode { 15 => ::std::option::Option::Some(ErrorCode::ExtraVerificationRequired), 16 => ::std::option::Option::Some(ErrorCode::InvalidAppKey), 17 => ::std::option::Option::Some(ErrorCode::ApplicationBanned), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6706,17 +7455,20 @@ impl ::protobuf::ProtobufEnum for ErrorCode { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ErrorCode", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ErrorCode", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ErrorCode { -} +impl ::std::marker::Copy for ErrorCode {} impl ::std::default::Default for ErrorCode { fn default() -> Self { @@ -6824,16 +7576,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/mercury.rs b/protocol/src/mercury.rs index ab6f5f9a..c7f50f8f 100644 --- a/protocol/src/mercury.rs +++ b/protocol/src/mercury.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct MercuryMultiGetRequest { // message fields request: ::protobuf::RepeatedField, @@ -48,7 +48,6 @@ impl MercuryMultiGetRequest { // repeated .MercuryRequest request = 1; - pub fn get_request(&self) -> &[MercuryRequest] { &self.request } @@ -78,20 +77,28 @@ impl ::protobuf::Message for MercuryMultiGetRequest { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.request)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -104,18 +111,21 @@ impl ::protobuf::Message for MercuryMultiGetRequest { for value in &self.request { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.request { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -151,29 +161,34 @@ impl ::protobuf::Message for MercuryMultiGetRequest { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "request", - |m: &MercuryMultiGetRequest| { &m.request }, - |m: &mut MercuryMultiGetRequest| { &mut m.request }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "request", + |m: &MercuryMultiGetRequest| &m.request, + |m: &mut MercuryMultiGetRequest| &mut m.request, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryMultiGetRequest", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static MercuryMultiGetRequest { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(MercuryMultiGetRequest::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(MercuryMultiGetRequest::new) } } } @@ -196,7 +211,7 @@ impl ::protobuf::reflect::ProtobufValue for MercuryMultiGetRequest { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct MercuryMultiGetReply { // message fields reply: ::protobuf::RepeatedField, @@ -218,7 +233,6 @@ impl MercuryMultiGetReply { // repeated .MercuryReply reply = 1; - pub fn get_reply(&self) -> &[MercuryReply] { &self.reply } @@ -248,20 +262,28 @@ impl ::protobuf::Message for MercuryMultiGetReply { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.reply)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -274,18 +296,21 @@ impl ::protobuf::Message for MercuryMultiGetReply { for value in &self.reply { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.reply { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -321,29 +346,34 @@ impl ::protobuf::Message for MercuryMultiGetReply { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "reply", - |m: &MercuryMultiGetReply| { &m.reply }, - |m: &mut MercuryMultiGetReply| { &mut m.reply }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "reply", + |m: &MercuryMultiGetReply| &m.reply, + |m: &mut MercuryMultiGetReply| &mut m.reply, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryMultiGetReply", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static MercuryMultiGetReply { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(MercuryMultiGetReply::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(MercuryMultiGetReply::new) } } } @@ -366,7 +396,7 @@ impl ::protobuf::reflect::ProtobufValue for MercuryMultiGetReply { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct MercuryRequest { // message fields uri: ::protobuf::SingularField<::std::string::String>, @@ -391,7 +421,6 @@ impl MercuryRequest { // optional string uri = 1; - pub fn get_uri(&self) -> &str { match self.uri.as_ref() { Some(v) => &v, @@ -422,12 +451,13 @@ impl MercuryRequest { // Take field pub fn take_uri(&mut self) -> ::std::string::String { - self.uri.take().unwrap_or_else(|| ::std::string::String::new()) + self.uri + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string content_type = 2; - pub fn get_content_type(&self) -> &str { match self.content_type.as_ref() { Some(v) => &v, @@ -458,12 +488,13 @@ impl MercuryRequest { // Take field pub fn take_content_type(&mut self) -> ::std::string::String { - self.content_type.take().unwrap_or_else(|| ::std::string::String::new()) + self.content_type + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bytes body = 3; - pub fn get_body(&self) -> &[u8] { match self.body.as_ref() { Some(v) => &v, @@ -499,7 +530,6 @@ impl MercuryRequest { // optional bytes etag = 4; - pub fn get_etag(&self) -> &[u8] { match self.etag.as_ref() { Some(v) => &v, @@ -539,25 +569,37 @@ impl ::protobuf::Message for MercuryRequest { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.uri)?; - }, + } 2 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.content_type)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.content_type, + )?; + } 3 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.body)?; - }, + } 4 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.etag)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -584,7 +626,10 @@ impl ::protobuf::Message for MercuryRequest { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.uri.as_ref() { os.write_string(1, &v)?; } @@ -632,34 +677,55 @@ impl ::protobuf::Message for MercuryRequest { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "uri", - |m: &MercuryRequest| { &m.uri }, - |m: &mut MercuryRequest| { &mut m.uri }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "content_type", - |m: &MercuryRequest| { &m.content_type }, - |m: &mut MercuryRequest| { &mut m.content_type }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "body", - |m: &MercuryRequest| { &m.body }, - |m: &mut MercuryRequest| { &mut m.body }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "etag", - |m: &MercuryRequest| { &m.etag }, - |m: &mut MercuryRequest| { &mut m.etag }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "uri", + |m: &MercuryRequest| &m.uri, + |m: &mut MercuryRequest| &mut m.uri, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "content_type", + |m: &MercuryRequest| &m.content_type, + |m: &mut MercuryRequest| &mut m.content_type, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "body", + |m: &MercuryRequest| &m.body, + |m: &mut MercuryRequest| &mut m.body, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "etag", + |m: &MercuryRequest| &m.etag, + |m: &mut MercuryRequest| &mut m.etag, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryRequest", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -667,9 +733,7 @@ impl ::protobuf::Message for MercuryRequest { fn default_instance() -> &'static MercuryRequest { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(MercuryRequest::new) - } + unsafe { instance.get(MercuryRequest::new) } } } @@ -695,7 +759,7 @@ impl ::protobuf::reflect::ProtobufValue for MercuryRequest { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct MercuryReply { // message fields status_code: ::std::option::Option, @@ -723,7 +787,6 @@ impl MercuryReply { // optional sint32 status_code = 1; - pub fn get_status_code(&self) -> i32 { self.status_code.unwrap_or(0) } @@ -742,7 +805,6 @@ impl MercuryReply { // optional string status_message = 2; - pub fn get_status_message(&self) -> &str { match self.status_message.as_ref() { Some(v) => &v, @@ -773,14 +835,16 @@ impl MercuryReply { // Take field pub fn take_status_message(&mut self) -> ::std::string::String { - self.status_message.take().unwrap_or_else(|| ::std::string::String::new()) + self.status_message + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .MercuryReply.CachePolicy cache_policy = 3; - pub fn get_cache_policy(&self) -> MercuryReply_CachePolicy { - self.cache_policy.unwrap_or(MercuryReply_CachePolicy::CACHE_NO) + self.cache_policy + .unwrap_or(MercuryReply_CachePolicy::CACHE_NO) } pub fn clear_cache_policy(&mut self) { self.cache_policy = ::std::option::Option::None; @@ -797,7 +861,6 @@ impl MercuryReply { // optional sint32 ttl = 4; - pub fn get_ttl(&self) -> i32 { self.ttl.unwrap_or(0) } @@ -816,7 +879,6 @@ impl MercuryReply { // optional bytes etag = 5; - pub fn get_etag(&self) -> &[u8] { match self.etag.as_ref() { Some(v) => &v, @@ -852,7 +914,6 @@ impl MercuryReply { // optional string content_type = 6; - pub fn get_content_type(&self) -> &str { match self.content_type.as_ref() { Some(v) => &v, @@ -883,12 +944,13 @@ impl MercuryReply { // Take field pub fn take_content_type(&mut self) -> ::std::string::String { - self.content_type.take().unwrap_or_else(|| ::std::string::String::new()) + self.content_type + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bytes body = 7; - pub fn get_body(&self) -> &[u8] { match self.body.as_ref() { Some(v) => &v, @@ -928,42 +990,66 @@ impl ::protobuf::Message for MercuryReply { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.status_code = ::std::option::Option::Some(tmp); - }, + } 2 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.status_message)?; - }, - 3 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.cache_policy, 3, &mut self.unknown_fields)? - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.status_message, + )?; + } + 3 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.cache_policy, + 3, + &mut self.unknown_fields, + )?, 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.ttl = ::std::option::Option::Some(tmp); - }, + } 5 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.etag)?; - }, + } 6 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.content_type)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.content_type, + )?; + } 7 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.body)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -999,7 +1085,10 @@ impl ::protobuf::Message for MercuryReply { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.status_code { os.write_sint32(1, v)?; } @@ -1056,49 +1145,79 @@ impl ::protobuf::Message for MercuryReply { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "status_code", - |m: &MercuryReply| { &m.status_code }, - |m: &mut MercuryReply| { &mut m.status_code }, + |m: &MercuryReply| &m.status_code, + |m: &mut MercuryReply| &mut m.status_code, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "status_message", - |m: &MercuryReply| { &m.status_message }, - |m: &mut MercuryReply| { &mut m.status_message }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "status_message", + |m: &MercuryReply| &m.status_message, + |m: &mut MercuryReply| &mut m.status_message, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "cache_policy", - |m: &MercuryReply| { &m.cache_policy }, - |m: &mut MercuryReply| { &mut m.cache_policy }, + |m: &MercuryReply| &m.cache_policy, + |m: &mut MercuryReply| &mut m.cache_policy, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "ttl", - |m: &MercuryReply| { &m.ttl }, - |m: &mut MercuryReply| { &mut m.ttl }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "etag", - |m: &MercuryReply| { &m.etag }, - |m: &mut MercuryReply| { &mut m.etag }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "content_type", - |m: &MercuryReply| { &m.content_type }, - |m: &mut MercuryReply| { &mut m.content_type }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "body", - |m: &MercuryReply| { &m.body }, - |m: &mut MercuryReply| { &mut m.body }, + |m: &MercuryReply| &m.ttl, + |m: &mut MercuryReply| &mut m.ttl, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "etag", + |m: &MercuryReply| &m.etag, + |m: &mut MercuryReply| &mut m.etag, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "content_type", + |m: &MercuryReply| &m.content_type, + |m: &mut MercuryReply| &mut m.content_type, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "body", + |m: &MercuryReply| &m.body, + |m: &mut MercuryReply| &mut m.body, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "MercuryReply", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1106,9 +1225,7 @@ impl ::protobuf::Message for MercuryReply { fn default_instance() -> &'static MercuryReply { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(MercuryReply::new) - } + unsafe { instance.get(MercuryReply::new) } } } @@ -1137,7 +1254,7 @@ impl ::protobuf::reflect::ProtobufValue for MercuryReply { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum MercuryReply_CachePolicy { CACHE_NO = 1, CACHE_PRIVATE = 2, @@ -1154,7 +1271,7 @@ impl ::protobuf::ProtobufEnum for MercuryReply_CachePolicy { 1 => ::std::option::Option::Some(MercuryReply_CachePolicy::CACHE_NO), 2 => ::std::option::Option::Some(MercuryReply_CachePolicy::CACHE_PRIVATE), 3 => ::std::option::Option::Some(MercuryReply_CachePolicy::CACHE_PUBLIC), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -1168,17 +1285,20 @@ impl ::protobuf::ProtobufEnum for MercuryReply_CachePolicy { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("MercuryReply.CachePolicy", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "MercuryReply.CachePolicy", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for MercuryReply_CachePolicy { -} +impl ::std::marker::Copy for MercuryReply_CachePolicy {} // Note, `Default` is implemented although default value is not 0 impl ::std::default::Default for MercuryReply_CachePolicy { @@ -1193,7 +1313,7 @@ impl ::protobuf::reflect::ProtobufValue for MercuryReply_CachePolicy { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Header { // message fields uri: ::protobuf::SingularField<::std::string::String>, @@ -1219,7 +1339,6 @@ impl Header { // optional string uri = 1; - pub fn get_uri(&self) -> &str { match self.uri.as_ref() { Some(v) => &v, @@ -1250,12 +1369,13 @@ impl Header { // Take field pub fn take_uri(&mut self) -> ::std::string::String { - self.uri.take().unwrap_or_else(|| ::std::string::String::new()) + self.uri + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string content_type = 2; - pub fn get_content_type(&self) -> &str { match self.content_type.as_ref() { Some(v) => &v, @@ -1286,12 +1406,13 @@ impl Header { // Take field pub fn take_content_type(&mut self) -> ::std::string::String { - self.content_type.take().unwrap_or_else(|| ::std::string::String::new()) + self.content_type + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string method = 3; - pub fn get_method(&self) -> &str { match self.method.as_ref() { Some(v) => &v, @@ -1322,12 +1443,13 @@ impl Header { // Take field pub fn take_method(&mut self) -> ::std::string::String { - self.method.take().unwrap_or_else(|| ::std::string::String::new()) + self.method + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional sint32 status_code = 4; - pub fn get_status_code(&self) -> i32 { self.status_code.unwrap_or(0) } @@ -1346,7 +1468,6 @@ impl Header { // repeated .UserField user_fields = 6; - pub fn get_user_fields(&self) -> &[UserField] { &self.user_fields } @@ -1376,36 +1497,54 @@ impl ::protobuf::Message for Header { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.uri)?; - }, + } 2 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.content_type)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.content_type, + )?; + } 3 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.method)?; - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.status_code = ::std::option::Option::Some(tmp); - }, + } 6 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.user_fields)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.user_fields, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1430,13 +1569,16 @@ impl ::protobuf::Message for Header { for value in &self.user_fields { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.uri.as_ref() { os.write_string(1, &v)?; } @@ -1453,7 +1595,7 @@ impl ::protobuf::Message for Header { os.write_tag(6, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1489,39 +1631,59 @@ impl ::protobuf::Message for Header { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "uri", - |m: &Header| { &m.uri }, - |m: &mut Header| { &mut m.uri }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "content_type", - |m: &Header| { &m.content_type }, - |m: &mut Header| { &mut m.content_type }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "method", - |m: &Header| { &m.method }, - |m: &mut Header| { &mut m.method }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >("uri", |m: &Header| &m.uri, |m: &mut Header| &mut m.uri), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "content_type", + |m: &Header| &m.content_type, + |m: &mut Header| &mut m.content_type, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "method", + |m: &Header| &m.method, + |m: &mut Header| &mut m.method, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "status_code", - |m: &Header| { &m.status_code }, - |m: &mut Header| { &mut m.status_code }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "user_fields", - |m: &Header| { &m.user_fields }, - |m: &mut Header| { &mut m.user_fields }, + |m: &Header| &m.status_code, + |m: &mut Header| &mut m.status_code, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "user_fields", + |m: &Header| &m.user_fields, + |m: &mut Header| &mut m.user_fields, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::
( "Header", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1529,9 +1691,7 @@ impl ::protobuf::Message for Header { fn default_instance() -> &'static Header { static mut instance: ::protobuf::lazy::Lazy
= ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Header::new) - } + unsafe { instance.get(Header::new) } } } @@ -1558,7 +1718,7 @@ impl ::protobuf::reflect::ProtobufValue for Header { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct UserField { // message fields key: ::protobuf::SingularField<::std::string::String>, @@ -1581,7 +1741,6 @@ impl UserField { // optional string key = 1; - pub fn get_key(&self) -> &str { match self.key.as_ref() { Some(v) => &v, @@ -1612,12 +1771,13 @@ impl UserField { // Take field pub fn take_key(&mut self) -> ::std::string::String { - self.key.take().unwrap_or_else(|| ::std::string::String::new()) + self.key + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bytes value = 2; - pub fn get_value(&self) -> &[u8] { match self.value.as_ref() { Some(v) => &v, @@ -1657,19 +1817,27 @@ impl ::protobuf::Message for UserField { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.key)?; - }, + } 2 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.value)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1690,7 +1858,10 @@ impl ::protobuf::Message for UserField { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.key.as_ref() { os.write_string(1, &v)?; } @@ -1732,24 +1903,35 @@ impl ::protobuf::Message for UserField { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "key", - |m: &UserField| { &m.key }, - |m: &mut UserField| { &mut m.key }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "value", - |m: &UserField| { &m.value }, - |m: &mut UserField| { &mut m.value }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "key", + |m: &UserField| &m.key, + |m: &mut UserField| &mut m.key, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "value", + |m: &UserField| &m.value, + |m: &mut UserField| &mut m.value, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UserField", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1757,9 +1939,7 @@ impl ::protobuf::Message for UserField { fn default_instance() -> &'static UserField { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(UserField::new) - } + unsafe { instance.get(UserField::new) } } } @@ -1804,16 +1984,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x12\x0f\n\x05value\x18\x02\x20\x01(\x0cB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/metadata.rs b/protocol/src/metadata.rs index 99635e70..d96f3336 100644 --- a/protocol/src/metadata.rs +++ b/protocol/src/metadata.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct TopTracks { // message fields country: ::protobuf::SingularField<::std::string::String>, @@ -49,7 +49,6 @@ impl TopTracks { // optional string country = 1; - pub fn get_country(&self) -> &str { match self.country.as_ref() { Some(v) => &v, @@ -80,12 +79,13 @@ impl TopTracks { // Take field pub fn take_country(&mut self) -> ::std::string::String { - self.country.take().unwrap_or_else(|| ::std::string::String::new()) + self.country + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Track track = 2; - pub fn get_track(&self) -> &[Track] { &self.track } @@ -115,23 +115,31 @@ impl ::protobuf::Message for TopTracks { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.country)?; - }, + } 2 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.track)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -147,13 +155,16 @@ impl ::protobuf::Message for TopTracks { for value in &self.track { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.country.as_ref() { os.write_string(1, &v)?; } @@ -161,7 +172,7 @@ impl ::protobuf::Message for TopTracks { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -197,24 +208,35 @@ impl ::protobuf::Message for TopTracks { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "country", - |m: &TopTracks| { &m.country }, - |m: &mut TopTracks| { &mut m.country }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "track", - |m: &TopTracks| { &m.track }, - |m: &mut TopTracks| { &mut m.track }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "country", + |m: &TopTracks| &m.country, + |m: &mut TopTracks| &mut m.country, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "track", + |m: &TopTracks| &m.track, + |m: &mut TopTracks| &mut m.track, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "TopTracks", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -222,9 +244,7 @@ impl ::protobuf::Message for TopTracks { fn default_instance() -> &'static TopTracks { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(TopTracks::new) - } + unsafe { instance.get(TopTracks::new) } } } @@ -248,7 +268,7 @@ impl ::protobuf::reflect::ProtobufValue for TopTracks { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ActivityPeriod { // message fields start_year: ::std::option::Option, @@ -272,7 +292,6 @@ impl ActivityPeriod { // optional sint32 start_year = 1; - pub fn get_start_year(&self) -> i32 { self.start_year.unwrap_or(0) } @@ -291,7 +310,6 @@ impl ActivityPeriod { // optional sint32 end_year = 2; - pub fn get_end_year(&self) -> i32 { self.end_year.unwrap_or(0) } @@ -310,7 +328,6 @@ impl ActivityPeriod { // optional sint32 decade = 3; - pub fn get_decade(&self) -> i32 { self.decade.unwrap_or(0) } @@ -333,34 +350,48 @@ impl ::protobuf::Message for ActivityPeriod { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.start_year = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.end_year = ::std::option::Option::Some(tmp); - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.decade = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -384,7 +415,10 @@ impl ::protobuf::Message for ActivityPeriod { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.start_year { os.write_sint32(1, v)?; } @@ -429,29 +463,39 @@ impl ::protobuf::Message for ActivityPeriod { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "start_year", - |m: &ActivityPeriod| { &m.start_year }, - |m: &mut ActivityPeriod| { &mut m.start_year }, + |m: &ActivityPeriod| &m.start_year, + |m: &mut ActivityPeriod| &mut m.start_year, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "end_year", - |m: &ActivityPeriod| { &m.end_year }, - |m: &mut ActivityPeriod| { &mut m.end_year }, + |m: &ActivityPeriod| &m.end_year, + |m: &mut ActivityPeriod| &mut m.end_year, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "decade", - |m: &ActivityPeriod| { &m.decade }, - |m: &mut ActivityPeriod| { &mut m.decade }, + |m: &ActivityPeriod| &m.decade, + |m: &mut ActivityPeriod| &mut m.decade, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ActivityPeriod", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -459,9 +503,7 @@ impl ::protobuf::Message for ActivityPeriod { fn default_instance() -> &'static ActivityPeriod { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ActivityPeriod::new) - } + unsafe { instance.get(ActivityPeriod::new) } } } @@ -486,7 +528,7 @@ impl ::protobuf::reflect::ProtobufValue for ActivityPeriod { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Artist { // message fields gid: ::protobuf::SingularField<::std::vec::Vec>, @@ -524,7 +566,6 @@ impl Artist { // optional bytes gid = 1; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -560,7 +601,6 @@ impl Artist { // optional string name = 2; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -591,12 +631,13 @@ impl Artist { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional sint32 popularity = 3; - pub fn get_popularity(&self) -> i32 { self.popularity.unwrap_or(0) } @@ -615,7 +656,6 @@ impl Artist { // repeated .TopTracks top_track = 4; - pub fn get_top_track(&self) -> &[TopTracks] { &self.top_track } @@ -640,7 +680,6 @@ impl Artist { // repeated .AlbumGroup album_group = 5; - pub fn get_album_group(&self) -> &[AlbumGroup] { &self.album_group } @@ -665,7 +704,6 @@ impl Artist { // repeated .AlbumGroup single_group = 6; - pub fn get_single_group(&self) -> &[AlbumGroup] { &self.single_group } @@ -690,7 +728,6 @@ impl Artist { // repeated .AlbumGroup compilation_group = 7; - pub fn get_compilation_group(&self) -> &[AlbumGroup] { &self.compilation_group } @@ -710,12 +747,14 @@ impl Artist { // Take field pub fn take_compilation_group(&mut self) -> ::protobuf::RepeatedField { - ::std::mem::replace(&mut self.compilation_group, ::protobuf::RepeatedField::new()) + ::std::mem::replace( + &mut self.compilation_group, + ::protobuf::RepeatedField::new(), + ) } // repeated .AlbumGroup appears_on_group = 8; - pub fn get_appears_on_group(&self) -> &[AlbumGroup] { &self.appears_on_group } @@ -740,7 +779,6 @@ impl Artist { // repeated string genre = 9; - pub fn get_genre(&self) -> &[::std::string::String] { &self.genre } @@ -765,7 +803,6 @@ impl Artist { // repeated .ExternalId external_id = 10; - pub fn get_external_id(&self) -> &[ExternalId] { &self.external_id } @@ -790,7 +827,6 @@ impl Artist { // repeated .Image portrait = 11; - pub fn get_portrait(&self) -> &[Image] { &self.portrait } @@ -815,7 +851,6 @@ impl Artist { // repeated .Biography biography = 12; - pub fn get_biography(&self) -> &[Biography] { &self.biography } @@ -840,7 +875,6 @@ impl Artist { // repeated .ActivityPeriod activity_period = 13; - pub fn get_activity_period(&self) -> &[ActivityPeriod] { &self.activity_period } @@ -865,7 +899,6 @@ impl Artist { // repeated .Restriction restriction = 14; - pub fn get_restriction(&self) -> &[Restriction] { &self.restriction } @@ -890,7 +923,6 @@ impl Artist { // repeated .Artist related = 15; - pub fn get_related(&self) -> &[Artist] { &self.related } @@ -915,7 +947,6 @@ impl Artist { // optional bool is_portrait_album_cover = 16; - pub fn get_is_portrait_album_cover(&self) -> bool { self.is_portrait_album_cover.unwrap_or(false) } @@ -934,9 +965,10 @@ impl Artist { // optional .ImageGroup portrait_group = 17; - pub fn get_portrait_group(&self) -> &ImageGroup { - self.portrait_group.as_ref().unwrap_or_else(|| ImageGroup::default_instance()) + self.portrait_group + .as_ref() + .unwrap_or_else(|| ImageGroup::default_instance()) } pub fn clear_portrait_group(&mut self) { self.portrait_group.clear(); @@ -962,7 +994,9 @@ impl Artist { // Take field pub fn take_portrait_group(&mut self) -> ImageGroup { - self.portrait_group.take().unwrap_or_else(|| ImageGroup::new()) + self.portrait_group + .take() + .unwrap_or_else(|| ImageGroup::new()) } } @@ -972,131 +1006,175 @@ impl ::protobuf::Message for Artist { if !v.is_initialized() { return false; } - }; + } for v in &self.album_group { if !v.is_initialized() { return false; } - }; + } for v in &self.single_group { if !v.is_initialized() { return false; } - }; + } for v in &self.compilation_group { if !v.is_initialized() { return false; } - }; + } for v in &self.appears_on_group { if !v.is_initialized() { return false; } - }; + } for v in &self.external_id { if !v.is_initialized() { return false; } - }; + } for v in &self.portrait { if !v.is_initialized() { return false; } - }; + } for v in &self.biography { if !v.is_initialized() { return false; } - }; + } for v in &self.activity_period { if !v.is_initialized() { return false; } - }; + } for v in &self.restriction { if !v.is_initialized() { return false; } - }; + } for v in &self.related { if !v.is_initialized() { return false; } - }; + } for v in &self.portrait_group { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.popularity = ::std::option::Option::Some(tmp); - }, + } 4 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.top_track)?; - }, + } 5 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.album_group)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.album_group, + )?; + } 6 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.single_group)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.single_group, + )?; + } 7 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.compilation_group)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.compilation_group, + )?; + } 8 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.appears_on_group)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.appears_on_group, + )?; + } 9 => { ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.genre)?; - }, + } 10 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.external_id)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.external_id, + )?; + } 11 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.portrait)?; - }, + } 12 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.biography)?; - }, + } 13 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.activity_period)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.activity_period, + )?; + } 14 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.restriction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.restriction, + )?; + } 15 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.related)?; - }, + } 16 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.is_portrait_album_cover = ::std::option::Option::Some(tmp); - }, + } 17 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.portrait_group)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.portrait_group, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1118,50 +1196,50 @@ impl ::protobuf::Message for Artist { for value in &self.top_track { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.album_group { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.single_group { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.compilation_group { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.appears_on_group { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.genre { my_size += ::protobuf::rt::string_size(9, &value); - }; + } for value in &self.external_id { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.portrait { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.biography { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.activity_period { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.restriction { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.related { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(v) = self.is_portrait_album_cover { my_size += 3; } @@ -1174,7 +1252,10 @@ impl ::protobuf::Message for Artist { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gid.as_ref() { os.write_bytes(1, &v)?; } @@ -1188,60 +1269,60 @@ impl ::protobuf::Message for Artist { os.write_tag(4, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.album_group { os.write_tag(5, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.single_group { os.write_tag(6, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.compilation_group { os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.appears_on_group { os.write_tag(8, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.genre { os.write_string(9, &v)?; - }; + } for v in &self.external_id { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.portrait { os.write_tag(11, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.biography { os.write_tag(12, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.activity_period { os.write_tag(13, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.restriction { os.write_tag(14, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.related { os.write_tag(15, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(v) = self.is_portrait_album_cover { os.write_bool(16, v)?; } @@ -1285,99 +1366,175 @@ impl ::protobuf::Message for Artist { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &Artist| { &m.gid }, - |m: &mut Artist| { &mut m.gid }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Artist| { &m.name }, - |m: &mut Artist| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >("gid", |m: &Artist| &m.gid, |m: &mut Artist| &mut m.gid), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "name", |m: &Artist| &m.name, |m: &mut Artist| &mut m.name + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "popularity", - |m: &Artist| { &m.popularity }, - |m: &mut Artist| { &mut m.popularity }, + |m: &Artist| &m.popularity, + |m: &mut Artist| &mut m.popularity, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "top_track", - |m: &Artist| { &m.top_track }, - |m: &mut Artist| { &mut m.top_track }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "album_group", - |m: &Artist| { &m.album_group }, - |m: &mut Artist| { &mut m.album_group }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "single_group", - |m: &Artist| { &m.single_group }, - |m: &mut Artist| { &mut m.single_group }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "compilation_group", - |m: &Artist| { &m.compilation_group }, - |m: &mut Artist| { &mut m.compilation_group }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "appears_on_group", - |m: &Artist| { &m.appears_on_group }, - |m: &mut Artist| { &mut m.appears_on_group }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "genre", - |m: &Artist| { &m.genre }, - |m: &mut Artist| { &mut m.genre }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "external_id", - |m: &Artist| { &m.external_id }, - |m: &mut Artist| { &mut m.external_id }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "portrait", - |m: &Artist| { &m.portrait }, - |m: &mut Artist| { &mut m.portrait }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "biography", - |m: &Artist| { &m.biography }, - |m: &mut Artist| { &mut m.biography }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "activity_period", - |m: &Artist| { &m.activity_period }, - |m: &mut Artist| { &mut m.activity_period }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "restriction", - |m: &Artist| { &m.restriction }, - |m: &mut Artist| { &mut m.restriction }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "related", - |m: &Artist| { &m.related }, - |m: &mut Artist| { &mut m.related }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "top_track", + |m: &Artist| &m.top_track, + |m: &mut Artist| &mut m.top_track, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "album_group", + |m: &Artist| &m.album_group, + |m: &mut Artist| &mut m.album_group, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "single_group", + |m: &Artist| &m.single_group, + |m: &mut Artist| &mut m.single_group, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "compilation_group", + |m: &Artist| &m.compilation_group, + |m: &mut Artist| &mut m.compilation_group, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "appears_on_group", + |m: &Artist| &m.appears_on_group, + |m: &mut Artist| &mut m.appears_on_group, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "genre", + |m: &Artist| &m.genre, + |m: &mut Artist| &mut m.genre, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "external_id", + |m: &Artist| &m.external_id, + |m: &mut Artist| &mut m.external_id, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "portrait", + |m: &Artist| &m.portrait, + |m: &mut Artist| &mut m.portrait, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "biography", + |m: &Artist| &m.biography, + |m: &mut Artist| &mut m.biography, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "activity_period", + |m: &Artist| &m.activity_period, + |m: &mut Artist| &mut m.activity_period, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "restriction", + |m: &Artist| &m.restriction, + |m: &mut Artist| &mut m.restriction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "related", + |m: &Artist| &m.related, + |m: &mut Artist| &mut m.related, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "is_portrait_album_cover", - |m: &Artist| { &m.is_portrait_album_cover }, - |m: &mut Artist| { &mut m.is_portrait_album_cover }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "portrait_group", - |m: &Artist| { &m.portrait_group }, - |m: &mut Artist| { &mut m.portrait_group }, + |m: &Artist| &m.is_portrait_album_cover, + |m: &mut Artist| &mut m.is_portrait_album_cover, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "portrait_group", + |m: &Artist| &m.portrait_group, + |m: &mut Artist| &mut m.portrait_group, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Artist", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1385,9 +1542,7 @@ impl ::protobuf::Message for Artist { fn default_instance() -> &'static Artist { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Artist::new) - } + unsafe { instance.get(Artist::new) } } } @@ -1426,7 +1581,7 @@ impl ::protobuf::reflect::ProtobufValue for Artist { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct AlbumGroup { // message fields album: ::protobuf::RepeatedField, @@ -1448,7 +1603,6 @@ impl AlbumGroup { // repeated .Album album = 1; - pub fn get_album(&self) -> &[Album] { &self.album } @@ -1478,20 +1632,28 @@ impl ::protobuf::Message for AlbumGroup { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.album)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1504,18 +1666,21 @@ impl ::protobuf::Message for AlbumGroup { for value in &self.album { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.album { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1551,19 +1716,25 @@ impl ::protobuf::Message for AlbumGroup { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "album", - |m: &AlbumGroup| { &m.album }, - |m: &mut AlbumGroup| { &mut m.album }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "album", + |m: &AlbumGroup| &m.album, + |m: &mut AlbumGroup| &mut m.album, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AlbumGroup", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1571,9 +1742,7 @@ impl ::protobuf::Message for AlbumGroup { fn default_instance() -> &'static AlbumGroup { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(AlbumGroup::new) - } + unsafe { instance.get(AlbumGroup::new) } } } @@ -1596,7 +1765,7 @@ impl ::protobuf::reflect::ProtobufValue for AlbumGroup { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Date { // message fields year: ::std::option::Option, @@ -1622,7 +1791,6 @@ impl Date { // optional sint32 year = 1; - pub fn get_year(&self) -> i32 { self.year.unwrap_or(0) } @@ -1641,7 +1809,6 @@ impl Date { // optional sint32 month = 2; - pub fn get_month(&self) -> i32 { self.month.unwrap_or(0) } @@ -1660,7 +1827,6 @@ impl Date { // optional sint32 day = 3; - pub fn get_day(&self) -> i32 { self.day.unwrap_or(0) } @@ -1679,7 +1845,6 @@ impl Date { // optional sint32 hour = 4; - pub fn get_hour(&self) -> i32 { self.hour.unwrap_or(0) } @@ -1698,7 +1863,6 @@ impl Date { // optional sint32 minute = 5; - pub fn get_minute(&self) -> i32 { self.minute.unwrap_or(0) } @@ -1721,48 +1885,66 @@ impl ::protobuf::Message for Date { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.year = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.month = ::std::option::Option::Some(tmp); - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.day = ::std::option::Option::Some(tmp); - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.hour = ::std::option::Option::Some(tmp); - }, + } 5 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.minute = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1792,7 +1974,10 @@ impl ::protobuf::Message for Date { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.year { os.write_sint32(1, v)?; } @@ -1843,39 +2028,47 @@ impl ::protobuf::Message for Date { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( - "year", - |m: &Date| { &m.year }, - |m: &mut Date| { &mut m.year }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( + "year", |m: &Date| &m.year, |m: &mut Date| &mut m.year )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( - "month", - |m: &Date| { &m.month }, - |m: &mut Date| { &mut m.month }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( + "month", |m: &Date| &m.month, |m: &mut Date| &mut m.month )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( - "day", - |m: &Date| { &m.day }, - |m: &mut Date| { &mut m.day }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( + "day", |m: &Date| &m.day, |m: &mut Date| &mut m.day )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( - "hour", - |m: &Date| { &m.hour }, - |m: &mut Date| { &mut m.hour }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( + "hour", |m: &Date| &m.hour, |m: &mut Date| &mut m.hour )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "minute", - |m: &Date| { &m.minute }, - |m: &mut Date| { &mut m.minute }, + |m: &Date| &m.minute, + |m: &mut Date| &mut m.minute, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Date", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1883,9 +2076,7 @@ impl ::protobuf::Message for Date { fn default_instance() -> &'static Date { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Date::new) - } + unsafe { instance.get(Date::new) } } } @@ -1912,7 +2103,7 @@ impl ::protobuf::reflect::ProtobufValue for Date { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Album { // message fields gid: ::protobuf::SingularField<::std::vec::Vec>, @@ -1950,7 +2141,6 @@ impl Album { // optional bytes gid = 1; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -1986,7 +2176,6 @@ impl Album { // optional string name = 2; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -2017,12 +2206,13 @@ impl Album { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Artist artist = 3; - pub fn get_artist(&self) -> &[Artist] { &self.artist } @@ -2047,7 +2237,6 @@ impl Album { // optional .Album.Type typ = 4; - pub fn get_typ(&self) -> Album_Type { self.typ.unwrap_or(Album_Type::ALBUM) } @@ -2066,7 +2255,6 @@ impl Album { // optional string label = 5; - pub fn get_label(&self) -> &str { match self.label.as_ref() { Some(v) => &v, @@ -2097,14 +2285,17 @@ impl Album { // Take field pub fn take_label(&mut self) -> ::std::string::String { - self.label.take().unwrap_or_else(|| ::std::string::String::new()) + self.label + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .Date date = 6; - pub fn get_date(&self) -> &Date { - self.date.as_ref().unwrap_or_else(|| Date::default_instance()) + self.date + .as_ref() + .unwrap_or_else(|| Date::default_instance()) } pub fn clear_date(&mut self) { self.date.clear(); @@ -2135,7 +2326,6 @@ impl Album { // optional sint32 popularity = 7; - pub fn get_popularity(&self) -> i32 { self.popularity.unwrap_or(0) } @@ -2154,7 +2344,6 @@ impl Album { // repeated string genre = 8; - pub fn get_genre(&self) -> &[::std::string::String] { &self.genre } @@ -2179,7 +2368,6 @@ impl Album { // repeated .Image cover = 9; - pub fn get_cover(&self) -> &[Image] { &self.cover } @@ -2204,7 +2392,6 @@ impl Album { // repeated .ExternalId external_id = 10; - pub fn get_external_id(&self) -> &[ExternalId] { &self.external_id } @@ -2229,7 +2416,6 @@ impl Album { // repeated .Disc disc = 11; - pub fn get_disc(&self) -> &[Disc] { &self.disc } @@ -2254,7 +2440,6 @@ impl Album { // repeated string review = 12; - pub fn get_review(&self) -> &[::std::string::String] { &self.review } @@ -2279,7 +2464,6 @@ impl Album { // repeated .Copyright copyright = 13; - pub fn get_copyright(&self) -> &[Copyright] { &self.copyright } @@ -2304,7 +2488,6 @@ impl Album { // repeated .Restriction restriction = 14; - pub fn get_restriction(&self) -> &[Restriction] { &self.restriction } @@ -2329,7 +2512,6 @@ impl Album { // repeated .Album related = 15; - pub fn get_related(&self) -> &[Album] { &self.related } @@ -2354,7 +2536,6 @@ impl Album { // repeated .SalePeriod sale_period = 16; - pub fn get_sale_period(&self) -> &[SalePeriod] { &self.sale_period } @@ -2379,9 +2560,10 @@ impl Album { // optional .ImageGroup cover_group = 17; - pub fn get_cover_group(&self) -> &ImageGroup { - self.cover_group.as_ref().unwrap_or_else(|| ImageGroup::default_instance()) + self.cover_group + .as_ref() + .unwrap_or_else(|| ImageGroup::default_instance()) } pub fn clear_cover_group(&mut self) { self.cover_group.clear(); @@ -2417,117 +2599,147 @@ impl ::protobuf::Message for Album { if !v.is_initialized() { return false; } - }; + } for v in &self.date { if !v.is_initialized() { return false; } - }; + } for v in &self.cover { if !v.is_initialized() { return false; } - }; + } for v in &self.external_id { if !v.is_initialized() { return false; } - }; + } for v in &self.disc { if !v.is_initialized() { return false; } - }; + } for v in &self.copyright { if !v.is_initialized() { return false; } - }; + } for v in &self.restriction { if !v.is_initialized() { return false; } - }; + } for v in &self.related { if !v.is_initialized() { return false; } - }; + } for v in &self.sale_period { if !v.is_initialized() { return false; } - }; + } for v in &self.cover_group { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 3 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.artist)?; - }, - 4 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.typ, 4, &mut self.unknown_fields)? - }, + } + 4 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.typ, + 4, + &mut self.unknown_fields, + )?, 5 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.label)?; - }, + } 6 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.date)?; - }, + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.popularity = ::std::option::Option::Some(tmp); - }, + } 8 => { ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.genre)?; - }, + } 9 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.cover)?; - }, + } 10 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.external_id)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.external_id, + )?; + } 11 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.disc)?; - }, + } 12 => { ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.review)?; - }, + } 13 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.copyright)?; - }, + } 14 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.restriction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.restriction, + )?; + } 15 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.related)?; - }, + } 16 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.sale_period)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.sale_period, + )?; + } 17 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.cover_group)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.cover_group, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2546,7 +2758,7 @@ impl ::protobuf::Message for Album { for value in &self.artist { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(v) = self.typ { my_size += ::protobuf::rt::enum_size(4, v); } @@ -2562,38 +2774,38 @@ impl ::protobuf::Message for Album { } for value in &self.genre { my_size += ::protobuf::rt::string_size(8, &value); - }; + } for value in &self.cover { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.external_id { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.disc { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.review { my_size += ::protobuf::rt::string_size(12, &value); - }; + } for value in &self.copyright { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.restriction { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.related { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.sale_period { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.cover_group.as_ref() { let len = v.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -2603,7 +2815,10 @@ impl ::protobuf::Message for Album { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gid.as_ref() { os.write_bytes(1, &v)?; } @@ -2614,7 +2829,7 @@ impl ::protobuf::Message for Album { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(v) = self.typ { os.write_enum(4, v.value())?; } @@ -2631,45 +2846,45 @@ impl ::protobuf::Message for Album { } for v in &self.genre { os.write_string(8, &v)?; - }; + } for v in &self.cover { os.write_tag(9, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.external_id { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.disc { os.write_tag(11, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.review { os.write_string(12, &v)?; - }; + } for v in &self.copyright { os.write_tag(13, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.restriction { os.write_tag(14, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.related { os.write_tag(15, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.sale_period { os.write_tag(16, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.cover_group.as_ref() { os.write_tag(17, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2710,99 +2925,157 @@ impl ::protobuf::Message for Album { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &Album| { &m.gid }, - |m: &mut Album| { &mut m.gid }, + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >("gid", |m: &Album| &m.gid, |m: &mut Album| &mut m.gid), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >("name", |m: &Album| &m.name, |m: &mut Album| &mut m.name), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "artist", + |m: &Album| &m.artist, + |m: &mut Album| &mut m.artist, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( + "typ", |m: &Album| &m.typ, |m: &mut Album| &mut m.typ )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Album| { &m.name }, - |m: &mut Album| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "artist", - |m: &Album| { &m.artist }, - |m: &mut Album| { &mut m.artist }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( - "typ", - |m: &Album| { &m.typ }, - |m: &mut Album| { &mut m.typ }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "label", - |m: &Album| { &m.label }, - |m: &mut Album| { &mut m.label }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "date", - |m: &Album| { &m.date }, - |m: &mut Album| { &mut m.date }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "label", |m: &Album| &m.label, |m: &mut Album| &mut m.label + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("date", |m: &Album| &m.date, |m: &mut Album| &mut m.date), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "popularity", - |m: &Album| { &m.popularity }, - |m: &mut Album| { &mut m.popularity }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "genre", - |m: &Album| { &m.genre }, - |m: &mut Album| { &mut m.genre }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "cover", - |m: &Album| { &m.cover }, - |m: &mut Album| { &mut m.cover }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "external_id", - |m: &Album| { &m.external_id }, - |m: &mut Album| { &mut m.external_id }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "disc", - |m: &Album| { &m.disc }, - |m: &mut Album| { &mut m.disc }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "review", - |m: &Album| { &m.review }, - |m: &mut Album| { &mut m.review }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "copyright", - |m: &Album| { &m.copyright }, - |m: &mut Album| { &mut m.copyright }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "restriction", - |m: &Album| { &m.restriction }, - |m: &mut Album| { &mut m.restriction }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "related", - |m: &Album| { &m.related }, - |m: &mut Album| { &mut m.related }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "sale_period", - |m: &Album| { &m.sale_period }, - |m: &mut Album| { &mut m.sale_period }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "cover_group", - |m: &Album| { &m.cover_group }, - |m: &mut Album| { &mut m.cover_group }, + |m: &Album| &m.popularity, + |m: &mut Album| &mut m.popularity, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "genre", |m: &Album| &m.genre, |m: &mut Album| &mut m.genre + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "cover", |m: &Album| &m.cover, |m: &mut Album| &mut m.cover + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "external_id", + |m: &Album| &m.external_id, + |m: &mut Album| &mut m.external_id, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("disc", |m: &Album| &m.disc, |m: &mut Album| &mut m.disc), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "review", + |m: &Album| &m.review, + |m: &mut Album| &mut m.review, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "copyright", + |m: &Album| &m.copyright, + |m: &mut Album| &mut m.copyright, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "restriction", + |m: &Album| &m.restriction, + |m: &mut Album| &mut m.restriction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "related", + |m: &Album| &m.related, + |m: &mut Album| &mut m.related, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "sale_period", + |m: &Album| &m.sale_period, + |m: &mut Album| &mut m.sale_period, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "cover_group", + |m: &Album| &m.cover_group, + |m: &mut Album| &mut m.cover_group, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Album", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2810,9 +3083,7 @@ impl ::protobuf::Message for Album { fn default_instance() -> &'static Album { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Album::new) - } + unsafe { instance.get(Album::new) } } } @@ -2851,7 +3122,7 @@ impl ::protobuf::reflect::ProtobufValue for Album { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Album_Type { ALBUM = 1, SINGLE = 2, @@ -2870,7 +3141,7 @@ impl ::protobuf::ProtobufEnum for Album_Type { 2 => ::std::option::Option::Some(Album_Type::SINGLE), 3 => ::std::option::Option::Some(Album_Type::COMPILATION), 4 => ::std::option::Option::Some(Album_Type::EP), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -2885,17 +3156,20 @@ impl ::protobuf::ProtobufEnum for Album_Type { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Album.Type", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Album.Type", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Album_Type { -} +impl ::std::marker::Copy for Album_Type {} // Note, `Default` is implemented although default value is not 0 impl ::std::default::Default for Album_Type { @@ -2910,7 +3184,7 @@ impl ::protobuf::reflect::ProtobufValue for Album_Type { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Track { // message fields gid: ::protobuf::SingularField<::std::vec::Vec>, @@ -2946,7 +3220,6 @@ impl Track { // optional bytes gid = 1; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -2982,7 +3255,6 @@ impl Track { // optional string name = 2; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -3013,14 +3285,17 @@ impl Track { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .Album album = 3; - pub fn get_album(&self) -> &Album { - self.album.as_ref().unwrap_or_else(|| Album::default_instance()) + self.album + .as_ref() + .unwrap_or_else(|| Album::default_instance()) } pub fn clear_album(&mut self) { self.album.clear(); @@ -3051,7 +3326,6 @@ impl Track { // repeated .Artist artist = 4; - pub fn get_artist(&self) -> &[Artist] { &self.artist } @@ -3076,7 +3350,6 @@ impl Track { // optional sint32 number = 5; - pub fn get_number(&self) -> i32 { self.number.unwrap_or(0) } @@ -3095,7 +3368,6 @@ impl Track { // optional sint32 disc_number = 6; - pub fn get_disc_number(&self) -> i32 { self.disc_number.unwrap_or(0) } @@ -3114,7 +3386,6 @@ impl Track { // optional sint32 duration = 7; - pub fn get_duration(&self) -> i32 { self.duration.unwrap_or(0) } @@ -3133,7 +3404,6 @@ impl Track { // optional sint32 popularity = 8; - pub fn get_popularity(&self) -> i32 { self.popularity.unwrap_or(0) } @@ -3152,7 +3422,6 @@ impl Track { // optional bool explicit = 9; - pub fn get_explicit(&self) -> bool { self.explicit.unwrap_or(false) } @@ -3171,7 +3440,6 @@ impl Track { // repeated .ExternalId external_id = 10; - pub fn get_external_id(&self) -> &[ExternalId] { &self.external_id } @@ -3196,7 +3464,6 @@ impl Track { // repeated .Restriction restriction = 11; - pub fn get_restriction(&self) -> &[Restriction] { &self.restriction } @@ -3221,7 +3488,6 @@ impl Track { // repeated .AudioFile file = 12; - pub fn get_file(&self) -> &[AudioFile] { &self.file } @@ -3246,7 +3512,6 @@ impl Track { // repeated .Track alternative = 13; - pub fn get_alternative(&self) -> &[Track] { &self.alternative } @@ -3271,7 +3536,6 @@ impl Track { // repeated .SalePeriod sale_period = 14; - pub fn get_sale_period(&self) -> &[SalePeriod] { &self.sale_period } @@ -3296,7 +3560,6 @@ impl Track { // repeated .AudioFile preview = 15; - pub fn get_preview(&self) -> &[AudioFile] { &self.preview } @@ -3326,117 +3589,151 @@ impl ::protobuf::Message for Track { if !v.is_initialized() { return false; } - }; + } for v in &self.artist { if !v.is_initialized() { return false; } - }; + } for v in &self.external_id { if !v.is_initialized() { return false; } - }; + } for v in &self.restriction { if !v.is_initialized() { return false; } - }; + } for v in &self.file { if !v.is_initialized() { return false; } - }; + } for v in &self.alternative { if !v.is_initialized() { return false; } - }; + } for v in &self.sale_period { if !v.is_initialized() { return false; } - }; + } for v in &self.preview { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 3 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.album)?; - }, + } 4 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.artist)?; - }, + } 5 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.number = ::std::option::Option::Some(tmp); - }, + } 6 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.disc_number = ::std::option::Option::Some(tmp); - }, + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.duration = ::std::option::Option::Some(tmp); - }, + } 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.popularity = ::std::option::Option::Some(tmp); - }, + } 9 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.explicit = ::std::option::Option::Some(tmp); - }, + } 10 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.external_id)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.external_id, + )?; + } 11 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.restriction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.restriction, + )?; + } 12 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.file)?; - }, + } 13 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.alternative)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.alternative, + )?; + } 14 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.sale_period)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.sale_period, + )?; + } 15 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.preview)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3459,7 +3756,7 @@ impl ::protobuf::Message for Track { for value in &self.artist { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(v) = self.number { my_size += ::protobuf::rt::value_varint_zigzag_size(5, v); } @@ -3478,33 +3775,36 @@ impl ::protobuf::Message for Track { for value in &self.external_id { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.restriction { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.file { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.alternative { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.sale_period { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.preview { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gid.as_ref() { os.write_bytes(1, &v)?; } @@ -3520,7 +3820,7 @@ impl ::protobuf::Message for Track { os.write_tag(4, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(v) = self.number { os.write_sint32(5, v)?; } @@ -3540,32 +3840,32 @@ impl ::protobuf::Message for Track { os.write_tag(10, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.restriction { os.write_tag(11, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.file { os.write_tag(12, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.alternative { os.write_tag(13, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.sale_period { os.write_tag(14, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.preview { os.write_tag(15, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3601,89 +3901,141 @@ impl ::protobuf::Message for Track { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &Track| { &m.gid }, - |m: &mut Track| { &mut m.gid }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Track| { &m.name }, - |m: &mut Track| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "album", - |m: &Track| { &m.album }, - |m: &mut Track| { &mut m.album }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "artist", - |m: &Track| { &m.artist }, - |m: &mut Track| { &mut m.artist }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >("gid", |m: &Track| &m.gid, |m: &mut Track| &mut m.gid), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >("name", |m: &Track| &m.name, |m: &mut Track| &mut m.name), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "album", |m: &Track| &m.album, |m: &mut Track| &mut m.album + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "artist", + |m: &Track| &m.artist, + |m: &mut Track| &mut m.artist, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "number", - |m: &Track| { &m.number }, - |m: &mut Track| { &mut m.number }, + |m: &Track| &m.number, + |m: &mut Track| &mut m.number, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "disc_number", - |m: &Track| { &m.disc_number }, - |m: &mut Track| { &mut m.disc_number }, + |m: &Track| &m.disc_number, + |m: &mut Track| &mut m.disc_number, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "duration", - |m: &Track| { &m.duration }, - |m: &mut Track| { &mut m.duration }, + |m: &Track| &m.duration, + |m: &mut Track| &mut m.duration, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "popularity", - |m: &Track| { &m.popularity }, - |m: &mut Track| { &mut m.popularity }, + |m: &Track| &m.popularity, + |m: &mut Track| &mut m.popularity, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "explicit", - |m: &Track| { &m.explicit }, - |m: &mut Track| { &mut m.explicit }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "external_id", - |m: &Track| { &m.external_id }, - |m: &mut Track| { &mut m.external_id }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "restriction", - |m: &Track| { &m.restriction }, - |m: &mut Track| { &mut m.restriction }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "file", - |m: &Track| { &m.file }, - |m: &mut Track| { &mut m.file }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "alternative", - |m: &Track| { &m.alternative }, - |m: &mut Track| { &mut m.alternative }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "sale_period", - |m: &Track| { &m.sale_period }, - |m: &mut Track| { &mut m.sale_period }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "preview", - |m: &Track| { &m.preview }, - |m: &mut Track| { &mut m.preview }, + |m: &Track| &m.explicit, + |m: &mut Track| &mut m.explicit, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "external_id", + |m: &Track| &m.external_id, + |m: &mut Track| &mut m.external_id, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "restriction", + |m: &Track| &m.restriction, + |m: &mut Track| &mut m.restriction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("file", |m: &Track| &m.file, |m: &mut Track| &mut m.file), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "alternative", + |m: &Track| &m.alternative, + |m: &mut Track| &mut m.alternative, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "sale_period", + |m: &Track| &m.sale_period, + |m: &mut Track| &mut m.sale_period, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "preview", + |m: &Track| &m.preview, + |m: &mut Track| &mut m.preview, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Track", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3691,9 +4043,7 @@ impl ::protobuf::Message for Track { fn default_instance() -> &'static Track { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Track::new) - } + unsafe { instance.get(Track::new) } } } @@ -3730,7 +4080,7 @@ impl ::protobuf::reflect::ProtobufValue for Track { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Image { // message fields file_id: ::protobuf::SingularField<::std::vec::Vec>, @@ -3755,7 +4105,6 @@ impl Image { // optional bytes file_id = 1; - pub fn get_file_id(&self) -> &[u8] { match self.file_id.as_ref() { Some(v) => &v, @@ -3786,12 +4135,13 @@ impl Image { // Take field pub fn take_file_id(&mut self) -> ::std::vec::Vec { - self.file_id.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.file_id + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional .Image.Size size = 2; - pub fn get_size(&self) -> Image_Size { self.size.unwrap_or(Image_Size::DEFAULT) } @@ -3810,7 +4160,6 @@ impl Image { // optional sint32 width = 3; - pub fn get_width(&self) -> i32 { self.width.unwrap_or(0) } @@ -3829,7 +4178,6 @@ impl Image { // optional sint32 height = 4; - pub fn get_height(&self) -> i32 { self.height.unwrap_or(0) } @@ -3852,33 +4200,49 @@ impl ::protobuf::Message for Image { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.file_id)?; - }, - 2 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.size, 2, &mut self.unknown_fields)? - }, + } + 2 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.size, + 2, + &mut self.unknown_fields, + )?, 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.width = ::std::option::Option::Some(tmp); - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.height = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3905,7 +4269,10 @@ impl ::protobuf::Message for Image { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.file_id.as_ref() { os.write_bytes(1, &v)?; } @@ -3953,34 +4320,47 @@ impl ::protobuf::Message for Image { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "file_id", - |m: &Image| { &m.file_id }, - |m: &mut Image| { &mut m.file_id }, + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "file_id", + |m: &Image| &m.file_id, + |m: &mut Image| &mut m.file_id, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( + "size", |m: &Image| &m.size, |m: &mut Image| &mut m.size )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( - "size", - |m: &Image| { &m.size }, - |m: &mut Image| { &mut m.size }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "width", - |m: &Image| { &m.width }, - |m: &mut Image| { &mut m.width }, + |m: &Image| &m.width, + |m: &mut Image| &mut m.width, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "height", - |m: &Image| { &m.height }, - |m: &mut Image| { &mut m.height }, + |m: &Image| &m.height, + |m: &mut Image| &mut m.height, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Image", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3988,9 +4368,7 @@ impl ::protobuf::Message for Image { fn default_instance() -> &'static Image { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Image::new) - } + unsafe { instance.get(Image::new) } } } @@ -4016,7 +4394,7 @@ impl ::protobuf::reflect::ProtobufValue for Image { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Image_Size { DEFAULT = 0, SMALL = 1, @@ -4035,7 +4413,7 @@ impl ::protobuf::ProtobufEnum for Image_Size { 1 => ::std::option::Option::Some(Image_Size::SMALL), 2 => ::std::option::Option::Some(Image_Size::LARGE), 3 => ::std::option::Option::Some(Image_Size::XLARGE), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -4050,17 +4428,20 @@ impl ::protobuf::ProtobufEnum for Image_Size { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Image.Size", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Image.Size", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Image_Size { -} +impl ::std::marker::Copy for Image_Size {} impl ::std::default::Default for Image_Size { fn default() -> Self { @@ -4074,7 +4455,7 @@ impl ::protobuf::reflect::ProtobufValue for Image_Size { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ImageGroup { // message fields image: ::protobuf::RepeatedField, @@ -4096,7 +4477,6 @@ impl ImageGroup { // repeated .Image image = 1; - pub fn get_image(&self) -> &[Image] { &self.image } @@ -4126,20 +4506,28 @@ impl ::protobuf::Message for ImageGroup { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.image)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4152,18 +4540,21 @@ impl ::protobuf::Message for ImageGroup { for value in &self.image { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.image { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4199,19 +4590,25 @@ impl ::protobuf::Message for ImageGroup { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "image", - |m: &ImageGroup| { &m.image }, - |m: &mut ImageGroup| { &mut m.image }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "image", + |m: &ImageGroup| &m.image, + |m: &mut ImageGroup| &mut m.image, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ImageGroup", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -4219,9 +4616,7 @@ impl ::protobuf::Message for ImageGroup { fn default_instance() -> &'static ImageGroup { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ImageGroup::new) - } + unsafe { instance.get(ImageGroup::new) } } } @@ -4244,7 +4639,7 @@ impl ::protobuf::reflect::ProtobufValue for ImageGroup { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Biography { // message fields text: ::protobuf::SingularField<::std::string::String>, @@ -4268,7 +4663,6 @@ impl Biography { // optional string text = 1; - pub fn get_text(&self) -> &str { match self.text.as_ref() { Some(v) => &v, @@ -4299,12 +4693,13 @@ impl Biography { // Take field pub fn take_text(&mut self) -> ::std::string::String { - self.text.take().unwrap_or_else(|| ::std::string::String::new()) + self.text + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Image portrait = 2; - pub fn get_portrait(&self) -> &[Image] { &self.portrait } @@ -4329,7 +4724,6 @@ impl Biography { // repeated .ImageGroup portrait_group = 3; - pub fn get_portrait_group(&self) -> &[ImageGroup] { &self.portrait_group } @@ -4359,31 +4753,43 @@ impl ::protobuf::Message for Biography { if !v.is_initialized() { return false; } - }; + } for v in &self.portrait_group { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.text)?; - }, + } 2 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.portrait)?; - }, + } 3 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.portrait_group)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.portrait_group, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4399,17 +4805,20 @@ impl ::protobuf::Message for Biography { for value in &self.portrait { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.portrait_group { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.text.as_ref() { os.write_string(1, &v)?; } @@ -4417,12 +4826,12 @@ impl ::protobuf::Message for Biography { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.portrait_group { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4458,29 +4867,45 @@ impl ::protobuf::Message for Biography { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "text", - |m: &Biography| { &m.text }, - |m: &mut Biography| { &mut m.text }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "portrait", - |m: &Biography| { &m.portrait }, - |m: &mut Biography| { &mut m.portrait }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "portrait_group", - |m: &Biography| { &m.portrait_group }, - |m: &mut Biography| { &mut m.portrait_group }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "text", + |m: &Biography| &m.text, + |m: &mut Biography| &mut m.text, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "portrait", + |m: &Biography| &m.portrait, + |m: &mut Biography| &mut m.portrait, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "portrait_group", + |m: &Biography| &m.portrait_group, + |m: &mut Biography| &mut m.portrait_group, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Biography", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -4488,9 +4913,7 @@ impl ::protobuf::Message for Biography { fn default_instance() -> &'static Biography { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Biography::new) - } + unsafe { instance.get(Biography::new) } } } @@ -4515,7 +4938,7 @@ impl ::protobuf::reflect::ProtobufValue for Biography { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Disc { // message fields number: ::std::option::Option, @@ -4539,7 +4962,6 @@ impl Disc { // optional sint32 number = 1; - pub fn get_number(&self) -> i32 { self.number.unwrap_or(0) } @@ -4558,7 +4980,6 @@ impl Disc { // optional string name = 2; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -4589,12 +5010,13 @@ impl Disc { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Track track = 3; - pub fn get_track(&self) -> &[Track] { &self.track } @@ -4624,30 +5046,40 @@ impl ::protobuf::Message for Disc { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.number = ::std::option::Option::Some(tmp); - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 3 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.track)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4666,13 +5098,16 @@ impl ::protobuf::Message for Disc { for value in &self.track { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.number { os.write_sint32(1, v)?; } @@ -4683,7 +5118,7 @@ impl ::protobuf::Message for Disc { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -4719,29 +5154,35 @@ impl ::protobuf::Message for Disc { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "number", - |m: &Disc| { &m.number }, - |m: &mut Disc| { &mut m.number }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Disc| { &m.name }, - |m: &mut Disc| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "track", - |m: &Disc| { &m.track }, - |m: &mut Disc| { &mut m.track }, + |m: &Disc| &m.number, + |m: &mut Disc| &mut m.number, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >("name", |m: &Disc| &m.name, |m: &mut Disc| &mut m.name), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("track", |m: &Disc| &m.track, |m: &mut Disc| &mut m.track), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Disc", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -4749,9 +5190,7 @@ impl ::protobuf::Message for Disc { fn default_instance() -> &'static Disc { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Disc::new) - } + unsafe { instance.get(Disc::new) } } } @@ -4776,7 +5215,7 @@ impl ::protobuf::reflect::ProtobufValue for Disc { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Copyright { // message fields typ: ::std::option::Option, @@ -4799,7 +5238,6 @@ impl Copyright { // optional .Copyright.Type typ = 1; - pub fn get_typ(&self) -> Copyright_Type { self.typ.unwrap_or(Copyright_Type::P) } @@ -4818,7 +5256,6 @@ impl Copyright { // optional string text = 2; - pub fn get_text(&self) -> &str { match self.text.as_ref() { Some(v) => &v, @@ -4849,7 +5286,9 @@ impl Copyright { // Take field pub fn take_text(&mut self) -> ::std::string::String { - self.text.take().unwrap_or_else(|| ::std::string::String::new()) + self.text + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -4858,19 +5297,31 @@ impl ::protobuf::Message for Copyright { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.typ, 1, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.typ, + 1, + &mut self.unknown_fields, + )?, 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.text)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -4891,7 +5342,10 @@ impl ::protobuf::Message for Copyright { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.typ { os.write_enum(1, v.value())?; } @@ -4933,24 +5387,33 @@ impl ::protobuf::Message for Copyright { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "typ", - |m: &Copyright| { &m.typ }, - |m: &mut Copyright| { &mut m.typ }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "text", - |m: &Copyright| { &m.text }, - |m: &mut Copyright| { &mut m.text }, + |m: &Copyright| &m.typ, + |m: &mut Copyright| &mut m.typ, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "text", + |m: &Copyright| &m.text, + |m: &mut Copyright| &mut m.text, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Copyright", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -4958,9 +5421,7 @@ impl ::protobuf::Message for Copyright { fn default_instance() -> &'static Copyright { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Copyright::new) - } + unsafe { instance.get(Copyright::new) } } } @@ -4984,7 +5445,7 @@ impl ::protobuf::reflect::ProtobufValue for Copyright { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Copyright_Type { P = 0, C = 1, @@ -4999,30 +5460,30 @@ impl ::protobuf::ProtobufEnum for Copyright_Type { match value { 0 => ::std::option::Option::Some(Copyright_Type::P), 1 => ::std::option::Option::Some(Copyright_Type::C), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } fn values() -> &'static [Self] { - static values: &'static [Copyright_Type] = &[ - Copyright_Type::P, - Copyright_Type::C, - ]; + static values: &'static [Copyright_Type] = &[Copyright_Type::P, Copyright_Type::C]; values } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Copyright.Type", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Copyright.Type", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Copyright_Type { -} +impl ::std::marker::Copy for Copyright_Type {} impl ::std::default::Default for Copyright_Type { fn default() -> Self { @@ -5036,7 +5497,7 @@ impl ::protobuf::reflect::ProtobufValue for Copyright_Type { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Restriction { // message fields catalogue: ::std::vec::Vec, @@ -5062,7 +5523,6 @@ impl Restriction { // repeated .Restriction.Catalogue catalogue = 1; - pub fn get_catalogue(&self) -> &[Restriction_Catalogue] { &self.catalogue } @@ -5087,7 +5547,6 @@ impl Restriction { // optional string countries_allowed = 2; - pub fn get_countries_allowed(&self) -> &str { match self.countries_allowed.as_ref() { Some(v) => &v, @@ -5118,12 +5577,13 @@ impl Restriction { // Take field pub fn take_countries_allowed(&mut self) -> ::std::string::String { - self.countries_allowed.take().unwrap_or_else(|| ::std::string::String::new()) + self.countries_allowed + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string countries_forbidden = 3; - pub fn get_countries_forbidden(&self) -> &str { match self.countries_forbidden.as_ref() { Some(v) => &v, @@ -5154,12 +5614,13 @@ impl Restriction { // Take field pub fn take_countries_forbidden(&mut self) -> ::std::string::String { - self.countries_forbidden.take().unwrap_or_else(|| ::std::string::String::new()) + self.countries_forbidden + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .Restriction.Type typ = 4; - pub fn get_typ(&self) -> Restriction_Type { self.typ.unwrap_or(Restriction_Type::STREAMING) } @@ -5178,7 +5639,6 @@ impl Restriction { // repeated string catalogue_str = 5; - pub fn get_catalogue_str(&self) -> &[::std::string::String] { &self.catalogue_str } @@ -5207,28 +5667,56 @@ impl ::protobuf::Message for Restriction { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.catalogue, 1, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.catalogue, + 1, + &mut self.unknown_fields, + )?, 2 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.countries_allowed)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.countries_allowed, + )?; + } 3 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.countries_forbidden)?; - }, - 4 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.typ, 4, &mut self.unknown_fields)? - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.countries_forbidden, + )?; + } + 4 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.typ, + 4, + &mut self.unknown_fields, + )?, 5 => { - ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.catalogue_str)?; - }, + ::protobuf::rt::read_repeated_string_into( + wire_type, + is, + &mut self.catalogue_str, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5240,7 +5728,7 @@ impl ::protobuf::Message for Restriction { let mut my_size = 0; for value in &self.catalogue { my_size += ::protobuf::rt::enum_size(1, *value); - }; + } if let Some(ref v) = self.countries_allowed.as_ref() { my_size += ::protobuf::rt::string_size(2, &v); } @@ -5252,16 +5740,19 @@ impl ::protobuf::Message for Restriction { } for value in &self.catalogue_str { my_size += ::protobuf::rt::string_size(5, &value); - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.catalogue { os.write_enum(1, v.value())?; - }; + } if let Some(ref v) = self.countries_allowed.as_ref() { os.write_string(2, &v)?; } @@ -5273,7 +5764,7 @@ impl ::protobuf::Message for Restriction { } for v in &self.catalogue_str { os.write_string(5, &v)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -5309,39 +5800,61 @@ impl ::protobuf::Message for Restriction { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "catalogue", - |m: &Restriction| { &m.catalogue }, - |m: &mut Restriction| { &mut m.catalogue }, + |m: &Restriction| &m.catalogue, + |m: &mut Restriction| &mut m.catalogue, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "countries_allowed", - |m: &Restriction| { &m.countries_allowed }, - |m: &mut Restriction| { &mut m.countries_allowed }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "countries_forbidden", - |m: &Restriction| { &m.countries_forbidden }, - |m: &mut Restriction| { &mut m.countries_forbidden }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "countries_allowed", + |m: &Restriction| &m.countries_allowed, + |m: &mut Restriction| &mut m.countries_allowed, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "countries_forbidden", + |m: &Restriction| &m.countries_forbidden, + |m: &mut Restriction| &mut m.countries_forbidden, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "typ", - |m: &Restriction| { &m.typ }, - |m: &mut Restriction| { &mut m.typ }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "catalogue_str", - |m: &Restriction| { &m.catalogue_str }, - |m: &mut Restriction| { &mut m.catalogue_str }, + |m: &Restriction| &m.typ, + |m: &mut Restriction| &mut m.typ, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "catalogue_str", + |m: &Restriction| &m.catalogue_str, + |m: &mut Restriction| &mut m.catalogue_str, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Restriction", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -5349,9 +5862,7 @@ impl ::protobuf::Message for Restriction { fn default_instance() -> &'static Restriction { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Restriction::new) - } + unsafe { instance.get(Restriction::new) } } } @@ -5378,7 +5889,7 @@ impl ::protobuf::reflect::ProtobufValue for Restriction { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Restriction_Catalogue { AD = 0, SUBSCRIPTION = 1, @@ -5399,7 +5910,7 @@ impl ::protobuf::ProtobufEnum for Restriction_Catalogue { 2 => ::std::option::Option::Some(Restriction_Catalogue::CATALOGUE_ALL), 3 => ::std::option::Option::Some(Restriction_Catalogue::SHUFFLE), 4 => ::std::option::Option::Some(Restriction_Catalogue::COMMERCIAL), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -5415,17 +5926,20 @@ impl ::protobuf::ProtobufEnum for Restriction_Catalogue { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Restriction.Catalogue", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Restriction.Catalogue", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Restriction_Catalogue { -} +impl ::std::marker::Copy for Restriction_Catalogue {} impl ::std::default::Default for Restriction_Catalogue { fn default() -> Self { @@ -5439,7 +5953,7 @@ impl ::protobuf::reflect::ProtobufValue for Restriction_Catalogue { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Restriction_Type { STREAMING = 0, } @@ -5452,29 +5966,30 @@ impl ::protobuf::ProtobufEnum for Restriction_Type { fn from_i32(value: i32) -> ::std::option::Option { match value { 0 => ::std::option::Option::Some(Restriction_Type::STREAMING), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } fn values() -> &'static [Self] { - static values: &'static [Restriction_Type] = &[ - Restriction_Type::STREAMING, - ]; + static values: &'static [Restriction_Type] = &[Restriction_Type::STREAMING]; values } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Restriction.Type", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Restriction.Type", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Restriction_Type { -} +impl ::std::marker::Copy for Restriction_Type {} impl ::std::default::Default for Restriction_Type { fn default() -> Self { @@ -5488,7 +6003,7 @@ impl ::protobuf::reflect::ProtobufValue for Restriction_Type { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Availability { // message fields catalogue_str: ::protobuf::RepeatedField<::std::string::String>, @@ -5511,7 +6026,6 @@ impl Availability { // repeated string catalogue_str = 1; - pub fn get_catalogue_str(&self) -> &[::std::string::String] { &self.catalogue_str } @@ -5536,9 +6050,10 @@ impl Availability { // optional .Date start = 2; - pub fn get_start(&self) -> &Date { - self.start.as_ref().unwrap_or_else(|| Date::default_instance()) + self.start + .as_ref() + .unwrap_or_else(|| Date::default_instance()) } pub fn clear_start(&mut self) { self.start.clear(); @@ -5574,23 +6089,35 @@ impl ::protobuf::Message for Availability { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.catalogue_str)?; - }, + ::protobuf::rt::read_repeated_string_into( + wire_type, + is, + &mut self.catalogue_str, + )?; + } 2 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.start)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5602,7 +6129,7 @@ impl ::protobuf::Message for Availability { let mut my_size = 0; for value in &self.catalogue_str { my_size += ::protobuf::rt::string_size(1, &value); - }; + } if let Some(ref v) = self.start.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -5612,10 +6139,13 @@ impl ::protobuf::Message for Availability { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.catalogue_str { os.write_string(1, &v)?; - }; + } if let Some(ref v) = self.start.as_ref() { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5656,24 +6186,35 @@ impl ::protobuf::Message for Availability { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "catalogue_str", - |m: &Availability| { &m.catalogue_str }, - |m: &mut Availability| { &mut m.catalogue_str }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "start", - |m: &Availability| { &m.start }, - |m: &mut Availability| { &mut m.start }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "catalogue_str", + |m: &Availability| &m.catalogue_str, + |m: &mut Availability| &mut m.catalogue_str, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "start", + |m: &Availability| &m.start, + |m: &mut Availability| &mut m.start, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Availability", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -5681,9 +6222,7 @@ impl ::protobuf::Message for Availability { fn default_instance() -> &'static Availability { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Availability::new) - } + unsafe { instance.get(Availability::new) } } } @@ -5707,7 +6246,7 @@ impl ::protobuf::reflect::ProtobufValue for Availability { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct SalePeriod { // message fields restriction: ::protobuf::RepeatedField, @@ -5731,7 +6270,6 @@ impl SalePeriod { // repeated .Restriction restriction = 1; - pub fn get_restriction(&self) -> &[Restriction] { &self.restriction } @@ -5756,9 +6294,10 @@ impl SalePeriod { // optional .Date start = 2; - pub fn get_start(&self) -> &Date { - self.start.as_ref().unwrap_or_else(|| Date::default_instance()) + self.start + .as_ref() + .unwrap_or_else(|| Date::default_instance()) } pub fn clear_start(&mut self) { self.start.clear(); @@ -5789,9 +6328,10 @@ impl SalePeriod { // optional .Date end = 3; - pub fn get_end(&self) -> &Date { - self.end.as_ref().unwrap_or_else(|| Date::default_instance()) + self.end + .as_ref() + .unwrap_or_else(|| Date::default_instance()) } pub fn clear_end(&mut self) { self.end.clear(); @@ -5827,36 +6367,48 @@ impl ::protobuf::Message for SalePeriod { if !v.is_initialized() { return false; } - }; + } for v in &self.start { if !v.is_initialized() { return false; } - }; + } for v in &self.end { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.restriction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.restriction, + )?; + } 2 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.start)?; - }, + } 3 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.end)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -5869,7 +6421,7 @@ impl ::protobuf::Message for SalePeriod { for value in &self.restriction { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.start.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -5883,12 +6435,15 @@ impl ::protobuf::Message for SalePeriod { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.restriction { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.start.as_ref() { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -5934,29 +6489,45 @@ impl ::protobuf::Message for SalePeriod { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "restriction", - |m: &SalePeriod| { &m.restriction }, - |m: &mut SalePeriod| { &mut m.restriction }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "start", - |m: &SalePeriod| { &m.start }, - |m: &mut SalePeriod| { &mut m.start }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "end", - |m: &SalePeriod| { &m.end }, - |m: &mut SalePeriod| { &mut m.end }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "restriction", + |m: &SalePeriod| &m.restriction, + |m: &mut SalePeriod| &mut m.restriction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "start", + |m: &SalePeriod| &m.start, + |m: &mut SalePeriod| &mut m.start, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "end", + |m: &SalePeriod| &m.end, + |m: &mut SalePeriod| &mut m.end, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "SalePeriod", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -5964,9 +6535,7 @@ impl ::protobuf::Message for SalePeriod { fn default_instance() -> &'static SalePeriod { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(SalePeriod::new) - } + unsafe { instance.get(SalePeriod::new) } } } @@ -5991,7 +6560,7 @@ impl ::protobuf::reflect::ProtobufValue for SalePeriod { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ExternalId { // message fields typ: ::protobuf::SingularField<::std::string::String>, @@ -6014,7 +6583,6 @@ impl ExternalId { // optional string typ = 1; - pub fn get_typ(&self) -> &str { match self.typ.as_ref() { Some(v) => &v, @@ -6045,12 +6613,13 @@ impl ExternalId { // Take field pub fn take_typ(&mut self) -> ::std::string::String { - self.typ.take().unwrap_or_else(|| ::std::string::String::new()) + self.typ + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string id = 2; - pub fn get_id(&self) -> &str { match self.id.as_ref() { Some(v) => &v, @@ -6081,7 +6650,9 @@ impl ExternalId { // Take field pub fn take_id(&mut self) -> ::std::string::String { - self.id.take().unwrap_or_else(|| ::std::string::String::new()) + self.id + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -6090,19 +6661,27 @@ impl ::protobuf::Message for ExternalId { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.typ)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.id)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -6123,7 +6702,10 @@ impl ::protobuf::Message for ExternalId { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.typ.as_ref() { os.write_string(1, &v)?; } @@ -6165,24 +6747,33 @@ impl ::protobuf::Message for ExternalId { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "typ", - |m: &ExternalId| { &m.typ }, - |m: &mut ExternalId| { &mut m.typ }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "id", - |m: &ExternalId| { &m.id }, - |m: &mut ExternalId| { &mut m.id }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "typ", + |m: &ExternalId| &m.typ, + |m: &mut ExternalId| &mut m.typ, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "id", |m: &ExternalId| &m.id, |m: &mut ExternalId| &mut m.id + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ExternalId", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -6190,9 +6781,7 @@ impl ::protobuf::Message for ExternalId { fn default_instance() -> &'static ExternalId { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ExternalId::new) - } + unsafe { instance.get(ExternalId::new) } } } @@ -6216,7 +6805,7 @@ impl ::protobuf::reflect::ProtobufValue for ExternalId { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct AudioFile { // message fields file_id: ::protobuf::SingularField<::std::vec::Vec>, @@ -6239,7 +6828,6 @@ impl AudioFile { // optional bytes file_id = 1; - pub fn get_file_id(&self) -> &[u8] { match self.file_id.as_ref() { Some(v) => &v, @@ -6270,12 +6858,13 @@ impl AudioFile { // Take field pub fn take_file_id(&mut self) -> ::std::vec::Vec { - self.file_id.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.file_id + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional .AudioFile.Format format = 2; - pub fn get_format(&self) -> AudioFile_Format { self.format.unwrap_or(AudioFile_Format::OGG_VORBIS_96) } @@ -6298,19 +6887,31 @@ impl ::protobuf::Message for AudioFile { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.file_id)?; - }, - 2 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.format, 2, &mut self.unknown_fields)? - }, + } + 2 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.format, + 2, + &mut self.unknown_fields, + )?, _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -6331,7 +6932,10 @@ impl ::protobuf::Message for AudioFile { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.file_id.as_ref() { os.write_bytes(1, &v)?; } @@ -6373,24 +6977,33 @@ impl ::protobuf::Message for AudioFile { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "file_id", - |m: &AudioFile| { &m.file_id }, - |m: &mut AudioFile| { &mut m.file_id }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "file_id", + |m: &AudioFile| &m.file_id, + |m: &mut AudioFile| &mut m.file_id, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "format", - |m: &AudioFile| { &m.format }, - |m: &mut AudioFile| { &mut m.format }, + |m: &AudioFile| &m.format, + |m: &mut AudioFile| &mut m.format, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "AudioFile", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -6398,9 +7011,7 @@ impl ::protobuf::Message for AudioFile { fn default_instance() -> &'static AudioFile { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(AudioFile::new) - } + unsafe { instance.get(AudioFile::new) } } } @@ -6424,7 +7035,7 @@ impl ::protobuf::reflect::ProtobufValue for AudioFile { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum AudioFile_Format { OGG_VORBIS_96 = 0, OGG_VORBIS_160 = 1, @@ -6463,7 +7074,7 @@ impl ::protobuf::ProtobufEnum for AudioFile_Format { 11 => ::std::option::Option::Some(AudioFile_Format::AAC_320), 12 => ::std::option::Option::Some(AudioFile_Format::MP4_128), 13 => ::std::option::Option::Some(AudioFile_Format::OTHER5), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -6488,17 +7099,20 @@ impl ::protobuf::ProtobufEnum for AudioFile_Format { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("AudioFile.Format", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "AudioFile.Format", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for AudioFile_Format { -} +impl ::std::marker::Copy for AudioFile_Format {} impl ::std::default::Default for AudioFile_Format { fn default() -> Self { @@ -6512,7 +7126,7 @@ impl ::protobuf::reflect::ProtobufValue for AudioFile_Format { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct VideoFile { // message fields file_id: ::protobuf::SingularField<::std::vec::Vec>, @@ -6534,7 +7148,6 @@ impl VideoFile { // optional bytes file_id = 1; - pub fn get_file_id(&self) -> &[u8] { match self.file_id.as_ref() { Some(v) => &v, @@ -6565,7 +7178,9 @@ impl VideoFile { // Take field pub fn take_file_id(&mut self) -> ::std::vec::Vec { - self.file_id.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.file_id + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -6574,16 +7189,24 @@ impl ::protobuf::Message for VideoFile { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.file_id)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -6601,7 +7224,10 @@ impl ::protobuf::Message for VideoFile { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.file_id.as_ref() { os.write_bytes(1, &v)?; } @@ -6640,19 +7266,25 @@ impl ::protobuf::Message for VideoFile { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "file_id", - |m: &VideoFile| { &m.file_id }, - |m: &mut VideoFile| { &mut m.file_id }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "file_id", + |m: &VideoFile| &m.file_id, + |m: &mut VideoFile| &mut m.file_id, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "VideoFile", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -6660,9 +7292,7 @@ impl ::protobuf::Message for VideoFile { fn default_instance() -> &'static VideoFile { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(VideoFile::new) - } + unsafe { instance.get(VideoFile::new) } } } @@ -6685,7 +7315,7 @@ impl ::protobuf::reflect::ProtobufValue for VideoFile { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Show { // message fields gid: ::protobuf::SingularField<::std::vec::Vec>, @@ -6725,7 +7355,6 @@ impl Show { // optional bytes gid = 1; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -6761,7 +7390,6 @@ impl Show { // optional string name = 2; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -6792,12 +7420,13 @@ impl Show { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string description = 64; - pub fn get_description(&self) -> &str { match self.description.as_ref() { Some(v) => &v, @@ -6828,12 +7457,13 @@ impl Show { // Take field pub fn take_description(&mut self) -> ::std::string::String { - self.description.take().unwrap_or_else(|| ::std::string::String::new()) + self.description + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional sint32 deprecated_popularity = 65; - pub fn get_deprecated_popularity(&self) -> i32 { self.deprecated_popularity.unwrap_or(0) } @@ -6852,7 +7482,6 @@ impl Show { // optional string publisher = 66; - pub fn get_publisher(&self) -> &str { match self.publisher.as_ref() { Some(v) => &v, @@ -6883,12 +7512,13 @@ impl Show { // Take field pub fn take_publisher(&mut self) -> ::std::string::String { - self.publisher.take().unwrap_or_else(|| ::std::string::String::new()) + self.publisher + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string language = 67; - pub fn get_language(&self) -> &str { match self.language.as_ref() { Some(v) => &v, @@ -6919,12 +7549,13 @@ impl Show { // Take field pub fn take_language(&mut self) -> ::std::string::String { - self.language.take().unwrap_or_else(|| ::std::string::String::new()) + self.language + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool explicit = 68; - pub fn get_explicit(&self) -> bool { self.explicit.unwrap_or(false) } @@ -6943,9 +7574,10 @@ impl Show { // optional .ImageGroup covers = 69; - pub fn get_covers(&self) -> &ImageGroup { - self.covers.as_ref().unwrap_or_else(|| ImageGroup::default_instance()) + self.covers + .as_ref() + .unwrap_or_else(|| ImageGroup::default_instance()) } pub fn clear_covers(&mut self) { self.covers.clear(); @@ -6976,7 +7608,6 @@ impl Show { // repeated .Episode episode = 70; - pub fn get_episode(&self) -> &[Episode] { &self.episode } @@ -7001,7 +7632,6 @@ impl Show { // repeated .Copyright copyright = 71; - pub fn get_copyright(&self) -> &[Copyright] { &self.copyright } @@ -7026,7 +7656,6 @@ impl Show { // repeated .Restriction restriction = 72; - pub fn get_restriction(&self) -> &[Restriction] { &self.restriction } @@ -7051,7 +7680,6 @@ impl Show { // repeated string keyword = 73; - pub fn get_keyword(&self) -> &[::std::string::String] { &self.keyword } @@ -7076,7 +7704,6 @@ impl Show { // optional .Show.MediaType media_type = 74; - pub fn get_media_type(&self) -> Show_MediaType { self.media_type.unwrap_or(Show_MediaType::MIXED) } @@ -7095,9 +7722,9 @@ impl Show { // optional .Show.ConsumptionOrder consumption_order = 75; - pub fn get_consumption_order(&self) -> Show_ConsumptionOrder { - self.consumption_order.unwrap_or(Show_ConsumptionOrder::SEQUENTIAL) + self.consumption_order + .unwrap_or(Show_ConsumptionOrder::SEQUENTIAL) } pub fn clear_consumption_order(&mut self) { self.consumption_order = ::std::option::Option::None; @@ -7114,7 +7741,6 @@ impl Show { // optional bool interpret_restriction_using_geoip = 76; - pub fn get_interpret_restriction_using_geoip(&self) -> bool { self.interpret_restriction_using_geoip.unwrap_or(false) } @@ -7133,7 +7759,6 @@ impl Show { // repeated .Availability availability = 78; - pub fn get_availability(&self) -> &[Availability] { &self.availability } @@ -7158,7 +7783,6 @@ impl Show { // optional string country_of_origin = 79; - pub fn get_country_of_origin(&self) -> &str { match self.country_of_origin.as_ref() { Some(v) => &v, @@ -7189,12 +7813,13 @@ impl Show { // Take field pub fn take_country_of_origin(&mut self) -> ::std::string::String { - self.country_of_origin.take().unwrap_or_else(|| ::std::string::String::new()) + self.country_of_origin + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Category categories = 80; - pub fn get_categories(&self) -> &[Category] { &self.categories } @@ -7219,7 +7844,6 @@ impl Show { // optional .Show.PassthroughEnum passthrough = 81; - pub fn get_passthrough(&self) -> Show_PassthroughEnum { self.passthrough.unwrap_or(Show_PassthroughEnum::UNKNOWN) } @@ -7243,111 +7867,157 @@ impl ::protobuf::Message for Show { if !v.is_initialized() { return false; } - }; + } for v in &self.episode { if !v.is_initialized() { return false; } - }; + } for v in &self.copyright { if !v.is_initialized() { return false; } - }; + } for v in &self.restriction { if !v.is_initialized() { return false; } - }; + } for v in &self.availability { if !v.is_initialized() { return false; } - }; + } for v in &self.categories { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 64 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.description)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.description, + )?; + } 65 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.deprecated_popularity = ::std::option::Option::Some(tmp); - }, + } 66 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.publisher)?; - }, + } 67 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.language)?; - }, + } 68 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.explicit = ::std::option::Option::Some(tmp); - }, + } 69 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.covers)?; - }, + } 70 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.episode)?; - }, + } 71 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.copyright)?; - }, + } 72 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.restriction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.restriction, + )?; + } 73 => { ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.keyword)?; - }, - 74 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.media_type, 74, &mut self.unknown_fields)? - }, - 75 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.consumption_order, 75, &mut self.unknown_fields)? - }, + } + 74 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.media_type, + 74, + &mut self.unknown_fields, + )?, + 75 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.consumption_order, + 75, + &mut self.unknown_fields, + )?, 76 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.interpret_restriction_using_geoip = ::std::option::Option::Some(tmp); - }, + } 78 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.availability)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.availability, + )?; + } 79 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.country_of_origin)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.country_of_origin, + )?; + } 80 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.categories)?; - }, - 81 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.passthrough, 81, &mut self.unknown_fields)? - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.categories, + )?; + } + 81 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.passthrough, + 81, + &mut self.unknown_fields, + )?, _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -7385,18 +8055,18 @@ impl ::protobuf::Message for Show { for value in &self.episode { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.copyright { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.restriction { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.keyword { my_size += ::protobuf::rt::string_size(73, &value); - }; + } if let Some(v) = self.media_type { my_size += ::protobuf::rt::enum_size(74, v); } @@ -7409,14 +8079,14 @@ impl ::protobuf::Message for Show { for value in &self.availability { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.country_of_origin.as_ref() { my_size += ::protobuf::rt::string_size(79, &v); } for value in &self.categories { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(v) = self.passthrough { my_size += ::protobuf::rt::enum_size(81, v); } @@ -7425,7 +8095,10 @@ impl ::protobuf::Message for Show { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gid.as_ref() { os.write_bytes(1, &v)?; } @@ -7456,20 +8129,20 @@ impl ::protobuf::Message for Show { os.write_tag(70, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.copyright { os.write_tag(71, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.restriction { os.write_tag(72, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.keyword { os.write_string(73, &v)?; - }; + } if let Some(v) = self.media_type { os.write_enum(74, v.value())?; } @@ -7483,7 +8156,7 @@ impl ::protobuf::Message for Show { os.write_tag(78, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.country_of_origin.as_ref() { os.write_string(79, &v)?; } @@ -7491,7 +8164,7 @@ impl ::protobuf::Message for Show { os.write_tag(80, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(v) = self.passthrough { os.write_enum(81, v.value())?; } @@ -7530,109 +8203,183 @@ impl ::protobuf::Message for Show { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &Show| { &m.gid }, - |m: &mut Show| { &mut m.gid }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Show| { &m.name }, - |m: &mut Show| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "description", - |m: &Show| { &m.description }, - |m: &mut Show| { &mut m.description }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >("gid", |m: &Show| &m.gid, |m: &mut Show| &mut m.gid), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >("name", |m: &Show| &m.name, |m: &mut Show| &mut m.name), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "description", + |m: &Show| &m.description, + |m: &mut Show| &mut m.description, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "deprecated_popularity", - |m: &Show| { &m.deprecated_popularity }, - |m: &mut Show| { &mut m.deprecated_popularity }, + |m: &Show| &m.deprecated_popularity, + |m: &mut Show| &mut m.deprecated_popularity, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "publisher", - |m: &Show| { &m.publisher }, - |m: &mut Show| { &mut m.publisher }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "language", - |m: &Show| { &m.language }, - |m: &mut Show| { &mut m.language }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "publisher", + |m: &Show| &m.publisher, + |m: &mut Show| &mut m.publisher, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "language", + |m: &Show| &m.language, + |m: &mut Show| &mut m.language, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "explicit", - |m: &Show| { &m.explicit }, - |m: &mut Show| { &mut m.explicit }, + |m: &Show| &m.explicit, + |m: &mut Show| &mut m.explicit, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "covers", - |m: &Show| { &m.covers }, - |m: &mut Show| { &mut m.covers }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "episode", - |m: &Show| { &m.episode }, - |m: &mut Show| { &mut m.episode }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "copyright", - |m: &Show| { &m.copyright }, - |m: &mut Show| { &mut m.copyright }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "restriction", - |m: &Show| { &m.restriction }, - |m: &mut Show| { &mut m.restriction }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "keyword", - |m: &Show| { &m.keyword }, - |m: &mut Show| { &mut m.keyword }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "covers", |m: &Show| &m.covers, |m: &mut Show| &mut m.covers + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "episode", + |m: &Show| &m.episode, + |m: &mut Show| &mut m.episode, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "copyright", + |m: &Show| &m.copyright, + |m: &mut Show| &mut m.copyright, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "restriction", + |m: &Show| &m.restriction, + |m: &mut Show| &mut m.restriction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "keyword", + |m: &Show| &m.keyword, + |m: &mut Show| &mut m.keyword, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "media_type", - |m: &Show| { &m.media_type }, - |m: &mut Show| { &mut m.media_type }, + |m: &Show| &m.media_type, + |m: &mut Show| &mut m.media_type, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "consumption_order", - |m: &Show| { &m.consumption_order }, - |m: &mut Show| { &mut m.consumption_order }, + |m: &Show| &m.consumption_order, + |m: &mut Show| &mut m.consumption_order, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "interpret_restriction_using_geoip", - |m: &Show| { &m.interpret_restriction_using_geoip }, - |m: &mut Show| { &mut m.interpret_restriction_using_geoip }, + |m: &Show| &m.interpret_restriction_using_geoip, + |m: &mut Show| &mut m.interpret_restriction_using_geoip, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "availability", - |m: &Show| { &m.availability }, - |m: &mut Show| { &mut m.availability }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "country_of_origin", - |m: &Show| { &m.country_of_origin }, - |m: &mut Show| { &mut m.country_of_origin }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "categories", - |m: &Show| { &m.categories }, - |m: &mut Show| { &mut m.categories }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "availability", + |m: &Show| &m.availability, + |m: &mut Show| &mut m.availability, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "country_of_origin", + |m: &Show| &m.country_of_origin, + |m: &mut Show| &mut m.country_of_origin, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "categories", + |m: &Show| &m.categories, + |m: &mut Show| &mut m.categories, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "passthrough", - |m: &Show| { &m.passthrough }, - |m: &mut Show| { &mut m.passthrough }, + |m: &Show| &m.passthrough, + |m: &mut Show| &mut m.passthrough, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Show", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -7640,9 +8387,7 @@ impl ::protobuf::Message for Show { fn default_instance() -> &'static Show { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Show::new) - } + unsafe { instance.get(Show::new) } } } @@ -7683,7 +8428,7 @@ impl ::protobuf::reflect::ProtobufValue for Show { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Show_MediaType { MIXED = 0, AUDIO = 1, @@ -7700,7 +8445,7 @@ impl ::protobuf::ProtobufEnum for Show_MediaType { 0 => ::std::option::Option::Some(Show_MediaType::MIXED), 1 => ::std::option::Option::Some(Show_MediaType::AUDIO), 2 => ::std::option::Option::Some(Show_MediaType::VIDEO), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -7714,17 +8459,20 @@ impl ::protobuf::ProtobufEnum for Show_MediaType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Show.MediaType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Show.MediaType", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Show_MediaType { -} +impl ::std::marker::Copy for Show_MediaType {} impl ::std::default::Default for Show_MediaType { fn default() -> Self { @@ -7738,7 +8486,7 @@ impl ::protobuf::reflect::ProtobufValue for Show_MediaType { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Show_ConsumptionOrder { SEQUENTIAL = 1, EPISODIC = 2, @@ -7755,7 +8503,7 @@ impl ::protobuf::ProtobufEnum for Show_ConsumptionOrder { 1 => ::std::option::Option::Some(Show_ConsumptionOrder::SEQUENTIAL), 2 => ::std::option::Option::Some(Show_ConsumptionOrder::EPISODIC), 3 => ::std::option::Option::Some(Show_ConsumptionOrder::RECENT), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -7769,17 +8517,20 @@ impl ::protobuf::ProtobufEnum for Show_ConsumptionOrder { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Show.ConsumptionOrder", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Show.ConsumptionOrder", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Show_ConsumptionOrder { -} +impl ::std::marker::Copy for Show_ConsumptionOrder {} // Note, `Default` is implemented although default value is not 0 impl ::std::default::Default for Show_ConsumptionOrder { @@ -7794,7 +8545,7 @@ impl ::protobuf::reflect::ProtobufValue for Show_ConsumptionOrder { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Show_PassthroughEnum { UNKNOWN = 0, NONE = 1, @@ -7811,7 +8562,7 @@ impl ::protobuf::ProtobufEnum for Show_PassthroughEnum { 0 => ::std::option::Option::Some(Show_PassthroughEnum::UNKNOWN), 1 => ::std::option::Option::Some(Show_PassthroughEnum::NONE), 2 => ::std::option::Option::Some(Show_PassthroughEnum::ALLOWED), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -7825,17 +8576,20 @@ impl ::protobuf::ProtobufEnum for Show_PassthroughEnum { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Show.PassthroughEnum", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Show.PassthroughEnum", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Show_PassthroughEnum { -} +impl ::std::marker::Copy for Show_PassthroughEnum {} impl ::std::default::Default for Show_PassthroughEnum { fn default() -> Self { @@ -7849,7 +8603,7 @@ impl ::protobuf::reflect::ProtobufValue for Show_PassthroughEnum { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Episode { // message fields gid: ::protobuf::SingularField<::std::vec::Vec>, @@ -7895,7 +8649,6 @@ impl Episode { // optional bytes gid = 1; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -7931,7 +8684,6 @@ impl Episode { // optional string name = 2; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -7962,12 +8714,13 @@ impl Episode { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional sint32 duration = 7; - pub fn get_duration(&self) -> i32 { self.duration.unwrap_or(0) } @@ -7986,7 +8739,6 @@ impl Episode { // optional sint32 popularity = 8; - pub fn get_popularity(&self) -> i32 { self.popularity.unwrap_or(0) } @@ -8005,7 +8757,6 @@ impl Episode { // repeated .AudioFile file = 12; - pub fn get_file(&self) -> &[AudioFile] { &self.file } @@ -8030,7 +8781,6 @@ impl Episode { // optional string description = 64; - pub fn get_description(&self) -> &str { match self.description.as_ref() { Some(v) => &v, @@ -8061,12 +8811,13 @@ impl Episode { // Take field pub fn take_description(&mut self) -> ::std::string::String { - self.description.take().unwrap_or_else(|| ::std::string::String::new()) + self.description + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional sint32 number = 65; - pub fn get_number(&self) -> i32 { self.number.unwrap_or(0) } @@ -8085,9 +8836,10 @@ impl Episode { // optional .Date publish_time = 66; - pub fn get_publish_time(&self) -> &Date { - self.publish_time.as_ref().unwrap_or_else(|| Date::default_instance()) + self.publish_time + .as_ref() + .unwrap_or_else(|| Date::default_instance()) } pub fn clear_publish_time(&mut self) { self.publish_time.clear(); @@ -8118,7 +8870,6 @@ impl Episode { // optional sint32 deprecated_popularity = 67; - pub fn get_deprecated_popularity(&self) -> i32 { self.deprecated_popularity.unwrap_or(0) } @@ -8137,9 +8888,10 @@ impl Episode { // optional .ImageGroup covers = 68; - pub fn get_covers(&self) -> &ImageGroup { - self.covers.as_ref().unwrap_or_else(|| ImageGroup::default_instance()) + self.covers + .as_ref() + .unwrap_or_else(|| ImageGroup::default_instance()) } pub fn clear_covers(&mut self) { self.covers.clear(); @@ -8170,7 +8922,6 @@ impl Episode { // optional string language = 69; - pub fn get_language(&self) -> &str { match self.language.as_ref() { Some(v) => &v, @@ -8201,12 +8952,13 @@ impl Episode { // Take field pub fn take_language(&mut self) -> ::std::string::String { - self.language.take().unwrap_or_else(|| ::std::string::String::new()) + self.language + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool explicit = 70; - pub fn get_explicit(&self) -> bool { self.explicit.unwrap_or(false) } @@ -8225,9 +8977,10 @@ impl Episode { // optional .Show show = 71; - pub fn get_show(&self) -> &Show { - self.show.as_ref().unwrap_or_else(|| Show::default_instance()) + self.show + .as_ref() + .unwrap_or_else(|| Show::default_instance()) } pub fn clear_show(&mut self) { self.show.clear(); @@ -8258,7 +9011,6 @@ impl Episode { // repeated .VideoFile video = 72; - pub fn get_video(&self) -> &[VideoFile] { &self.video } @@ -8283,7 +9035,6 @@ impl Episode { // repeated .VideoFile video_preview = 73; - pub fn get_video_preview(&self) -> &[VideoFile] { &self.video_preview } @@ -8308,7 +9059,6 @@ impl Episode { // repeated .AudioFile audio_preview = 74; - pub fn get_audio_preview(&self) -> &[AudioFile] { &self.audio_preview } @@ -8333,7 +9083,6 @@ impl Episode { // repeated .Restriction restriction = 75; - pub fn get_restriction(&self) -> &[Restriction] { &self.restriction } @@ -8358,9 +9107,10 @@ impl Episode { // optional .ImageGroup freeze_frame = 76; - pub fn get_freeze_frame(&self) -> &ImageGroup { - self.freeze_frame.as_ref().unwrap_or_else(|| ImageGroup::default_instance()) + self.freeze_frame + .as_ref() + .unwrap_or_else(|| ImageGroup::default_instance()) } pub fn clear_freeze_frame(&mut self) { self.freeze_frame.clear(); @@ -8386,12 +9136,13 @@ impl Episode { // Take field pub fn take_freeze_frame(&mut self) -> ImageGroup { - self.freeze_frame.take().unwrap_or_else(|| ImageGroup::new()) + self.freeze_frame + .take() + .unwrap_or_else(|| ImageGroup::new()) } // repeated string keyword = 77; - pub fn get_keyword(&self) -> &[::std::string::String] { &self.keyword } @@ -8416,7 +9167,6 @@ impl Episode { // optional bool suppress_monetization = 78; - pub fn get_suppress_monetization(&self) -> bool { self.suppress_monetization.unwrap_or(false) } @@ -8435,7 +9185,6 @@ impl Episode { // optional bool interpret_restriction_using_geoip = 79; - pub fn get_interpret_restriction_using_geoip(&self) -> bool { self.interpret_restriction_using_geoip.unwrap_or(false) } @@ -8454,7 +9203,6 @@ impl Episode { // optional bool allow_background_playback = 81; - pub fn get_allow_background_playback(&self) -> bool { self.allow_background_playback.unwrap_or(false) } @@ -8473,7 +9221,6 @@ impl Episode { // repeated .Availability availability = 82; - pub fn get_availability(&self) -> &[Availability] { &self.availability } @@ -8498,7 +9245,6 @@ impl Episode { // optional string external_url = 83; - pub fn get_external_url(&self) -> &str { match self.external_url.as_ref() { Some(v) => &v, @@ -8529,14 +9275,17 @@ impl Episode { // Take field pub fn take_external_url(&mut self) -> ::std::string::String { - self.external_url.take().unwrap_or_else(|| ::std::string::String::new()) + self.external_url + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .OriginalAudio original_audio = 84; - pub fn get_original_audio(&self) -> &OriginalAudio { - self.original_audio.as_ref().unwrap_or_else(|| OriginalAudio::default_instance()) + self.original_audio + .as_ref() + .unwrap_or_else(|| OriginalAudio::default_instance()) } pub fn clear_original_audio(&mut self) { self.original_audio.clear(); @@ -8562,7 +9311,9 @@ impl Episode { // Take field pub fn take_original_audio(&mut self) -> OriginalAudio { - self.original_audio.take().unwrap_or_else(|| OriginalAudio::new()) + self.original_audio + .take() + .unwrap_or_else(|| OriginalAudio::new()) } } @@ -8572,174 +9323,234 @@ impl ::protobuf::Message for Episode { if !v.is_initialized() { return false; } - }; + } for v in &self.publish_time { if !v.is_initialized() { return false; } - }; + } for v in &self.covers { if !v.is_initialized() { return false; } - }; + } for v in &self.show { if !v.is_initialized() { return false; } - }; + } for v in &self.video { if !v.is_initialized() { return false; } - }; + } for v in &self.video_preview { if !v.is_initialized() { return false; } - }; + } for v in &self.audio_preview { if !v.is_initialized() { return false; } - }; + } for v in &self.restriction { if !v.is_initialized() { return false; } - }; + } for v in &self.freeze_frame { if !v.is_initialized() { return false; } - }; + } for v in &self.availability { if !v.is_initialized() { return false; } - }; + } for v in &self.original_audio { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.duration = ::std::option::Option::Some(tmp); - }, + } 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.popularity = ::std::option::Option::Some(tmp); - }, + } 12 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.file)?; - }, + } 64 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.description)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.description, + )?; + } 65 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.number = ::std::option::Option::Some(tmp); - }, + } 66 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.publish_time)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.publish_time, + )?; + } 67 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_sint32()?; self.deprecated_popularity = ::std::option::Option::Some(tmp); - }, + } 68 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.covers)?; - }, + } 69 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.language)?; - }, + } 70 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.explicit = ::std::option::Option::Some(tmp); - }, + } 71 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.show)?; - }, + } 72 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.video)?; - }, + } 73 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.video_preview)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.video_preview, + )?; + } 74 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.audio_preview)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.audio_preview, + )?; + } 75 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.restriction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.restriction, + )?; + } 76 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.freeze_frame)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.freeze_frame, + )?; + } 77 => { ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.keyword)?; - }, + } 78 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.suppress_monetization = ::std::option::Option::Some(tmp); - }, + } 79 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.interpret_restriction_using_geoip = ::std::option::Option::Some(tmp); - }, + } 81 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.allow_background_playback = ::std::option::Option::Some(tmp); - }, + } 82 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.availability)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.availability, + )?; + } 83 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.external_url)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.external_url, + )?; + } 84 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.original_audio)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.original_audio, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -8764,7 +9575,7 @@ impl ::protobuf::Message for Episode { for value in &self.file { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.description.as_ref() { my_size += ::protobuf::rt::string_size(64, &v); } @@ -8795,26 +9606,26 @@ impl ::protobuf::Message for Episode { for value in &self.video { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.video_preview { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.audio_preview { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.restriction { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.freeze_frame.as_ref() { let len = v.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; } for value in &self.keyword { my_size += ::protobuf::rt::string_size(77, &value); - }; + } if let Some(v) = self.suppress_monetization { my_size += 3; } @@ -8827,7 +9638,7 @@ impl ::protobuf::Message for Episode { for value in &self.availability { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.external_url.as_ref() { my_size += ::protobuf::rt::string_size(83, &v); } @@ -8840,7 +9651,10 @@ impl ::protobuf::Message for Episode { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gid.as_ref() { os.write_bytes(1, &v)?; } @@ -8857,7 +9671,7 @@ impl ::protobuf::Message for Episode { os.write_tag(12, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.description.as_ref() { os.write_string(64, &v)?; } @@ -8892,22 +9706,22 @@ impl ::protobuf::Message for Episode { os.write_tag(72, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.video_preview { os.write_tag(73, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.audio_preview { os.write_tag(74, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.restriction { os.write_tag(75, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.freeze_frame.as_ref() { os.write_tag(76, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -8915,7 +9729,7 @@ impl ::protobuf::Message for Episode { } for v in &self.keyword { os.write_string(77, &v)?; - }; + } if let Some(v) = self.suppress_monetization { os.write_bool(78, v)?; } @@ -8929,7 +9743,7 @@ impl ::protobuf::Message for Episode { os.write_tag(82, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.external_url.as_ref() { os.write_string(83, &v)?; } @@ -8973,139 +9787,239 @@ impl ::protobuf::Message for Episode { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &Episode| { &m.gid }, - |m: &mut Episode| { &mut m.gid }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Episode| { &m.name }, - |m: &mut Episode| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >("gid", |m: &Episode| &m.gid, |m: &mut Episode| &mut m.gid), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "name", |m: &Episode| &m.name, |m: &mut Episode| &mut m.name + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "duration", - |m: &Episode| { &m.duration }, - |m: &mut Episode| { &mut m.duration }, + |m: &Episode| &m.duration, + |m: &mut Episode| &mut m.duration, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "popularity", - |m: &Episode| { &m.popularity }, - |m: &mut Episode| { &mut m.popularity }, + |m: &Episode| &m.popularity, + |m: &mut Episode| &mut m.popularity, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "file", - |m: &Episode| { &m.file }, - |m: &mut Episode| { &mut m.file }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "description", - |m: &Episode| { &m.description }, - |m: &mut Episode| { &mut m.description }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "file", |m: &Episode| &m.file, |m: &mut Episode| &mut m.file + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "description", + |m: &Episode| &m.description, + |m: &mut Episode| &mut m.description, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "number", - |m: &Episode| { &m.number }, - |m: &mut Episode| { &mut m.number }, + |m: &Episode| &m.number, + |m: &mut Episode| &mut m.number, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "publish_time", - |m: &Episode| { &m.publish_time }, - |m: &mut Episode| { &mut m.publish_time }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeSint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "publish_time", + |m: &Episode| &m.publish_time, + |m: &mut Episode| &mut m.publish_time, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeSint32, + >( "deprecated_popularity", - |m: &Episode| { &m.deprecated_popularity }, - |m: &mut Episode| { &mut m.deprecated_popularity }, + |m: &Episode| &m.deprecated_popularity, + |m: &mut Episode| &mut m.deprecated_popularity, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "covers", - |m: &Episode| { &m.covers }, - |m: &mut Episode| { &mut m.covers }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "language", - |m: &Episode| { &m.language }, - |m: &mut Episode| { &mut m.language }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "covers", + |m: &Episode| &m.covers, + |m: &mut Episode| &mut m.covers, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "language", + |m: &Episode| &m.language, + |m: &mut Episode| &mut m.language, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "explicit", - |m: &Episode| { &m.explicit }, - |m: &mut Episode| { &mut m.explicit }, + |m: &Episode| &m.explicit, + |m: &mut Episode| &mut m.explicit, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "show", - |m: &Episode| { &m.show }, - |m: &mut Episode| { &mut m.show }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "video", - |m: &Episode| { &m.video }, - |m: &mut Episode| { &mut m.video }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "video_preview", - |m: &Episode| { &m.video_preview }, - |m: &mut Episode| { &mut m.video_preview }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "audio_preview", - |m: &Episode| { &m.audio_preview }, - |m: &mut Episode| { &mut m.audio_preview }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "restriction", - |m: &Episode| { &m.restriction }, - |m: &mut Episode| { &mut m.restriction }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "freeze_frame", - |m: &Episode| { &m.freeze_frame }, - |m: &mut Episode| { &mut m.freeze_frame }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "keyword", - |m: &Episode| { &m.keyword }, - |m: &mut Episode| { &mut m.keyword }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "show", |m: &Episode| &m.show, |m: &mut Episode| &mut m.show + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "video", + |m: &Episode| &m.video, + |m: &mut Episode| &mut m.video, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "video_preview", + |m: &Episode| &m.video_preview, + |m: &mut Episode| &mut m.video_preview, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "audio_preview", + |m: &Episode| &m.audio_preview, + |m: &mut Episode| &mut m.audio_preview, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "restriction", + |m: &Episode| &m.restriction, + |m: &mut Episode| &mut m.restriction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "freeze_frame", + |m: &Episode| &m.freeze_frame, + |m: &mut Episode| &mut m.freeze_frame, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "keyword", + |m: &Episode| &m.keyword, + |m: &mut Episode| &mut m.keyword, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "suppress_monetization", - |m: &Episode| { &m.suppress_monetization }, - |m: &mut Episode| { &mut m.suppress_monetization }, + |m: &Episode| &m.suppress_monetization, + |m: &mut Episode| &mut m.suppress_monetization, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "interpret_restriction_using_geoip", - |m: &Episode| { &m.interpret_restriction_using_geoip }, - |m: &mut Episode| { &mut m.interpret_restriction_using_geoip }, + |m: &Episode| &m.interpret_restriction_using_geoip, + |m: &mut Episode| &mut m.interpret_restriction_using_geoip, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "allow_background_playback", - |m: &Episode| { &m.allow_background_playback }, - |m: &mut Episode| { &mut m.allow_background_playback }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "availability", - |m: &Episode| { &m.availability }, - |m: &mut Episode| { &mut m.availability }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "external_url", - |m: &Episode| { &m.external_url }, - |m: &mut Episode| { &mut m.external_url }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "original_audio", - |m: &Episode| { &m.original_audio }, - |m: &mut Episode| { &mut m.original_audio }, + |m: &Episode| &m.allow_background_playback, + |m: &mut Episode| &mut m.allow_background_playback, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "availability", + |m: &Episode| &m.availability, + |m: &mut Episode| &mut m.availability, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "external_url", + |m: &Episode| &m.external_url, + |m: &mut Episode| &mut m.external_url, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "original_audio", + |m: &Episode| &m.original_audio, + |m: &mut Episode| &mut m.original_audio, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Episode", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -9113,9 +10027,7 @@ impl ::protobuf::Message for Episode { fn default_instance() -> &'static Episode { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Episode::new) - } + unsafe { instance.get(Episode::new) } } } @@ -9162,7 +10074,7 @@ impl ::protobuf::reflect::ProtobufValue for Episode { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Category { // message fields name: ::protobuf::SingularField<::std::string::String>, @@ -9185,7 +10097,6 @@ impl Category { // optional string name = 1; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -9216,12 +10127,13 @@ impl Category { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Category subcategories = 2; - pub fn get_subcategories(&self) -> &[Category] { &self.subcategories } @@ -9251,23 +10163,35 @@ impl ::protobuf::Message for Category { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 2 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.subcategories)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.subcategories, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -9283,13 +10207,16 @@ impl ::protobuf::Message for Category { for value in &self.subcategories { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.name.as_ref() { os.write_string(1, &v)?; } @@ -9297,7 +10224,7 @@ impl ::protobuf::Message for Category { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -9333,24 +10260,35 @@ impl ::protobuf::Message for Category { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &Category| { &m.name }, - |m: &mut Category| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "subcategories", - |m: &Category| { &m.subcategories }, - |m: &mut Category| { &mut m.subcategories }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "name", + |m: &Category| &m.name, + |m: &mut Category| &mut m.name, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "subcategories", + |m: &Category| &m.subcategories, + |m: &mut Category| &mut m.subcategories, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Category", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -9358,9 +10296,7 @@ impl ::protobuf::Message for Category { fn default_instance() -> &'static Category { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Category::new) - } + unsafe { instance.get(Category::new) } } } @@ -9384,7 +10320,7 @@ impl ::protobuf::reflect::ProtobufValue for Category { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct OriginalAudio { // message fields uuid: ::protobuf::SingularField<::std::vec::Vec>, @@ -9406,7 +10342,6 @@ impl OriginalAudio { // optional bytes uuid = 1; - pub fn get_uuid(&self) -> &[u8] { match self.uuid.as_ref() { Some(v) => &v, @@ -9446,16 +10381,24 @@ impl ::protobuf::Message for OriginalAudio { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.uuid)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -9473,7 +10416,10 @@ impl ::protobuf::Message for OriginalAudio { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.uuid.as_ref() { os.write_bytes(1, &v)?; } @@ -9512,19 +10458,25 @@ impl ::protobuf::Message for OriginalAudio { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "uuid", - |m: &OriginalAudio| { &m.uuid }, - |m: &mut OriginalAudio| { &mut m.uuid }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "uuid", + |m: &OriginalAudio| &m.uuid, + |m: &mut OriginalAudio| &mut m.uuid, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "OriginalAudio", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -9532,9 +10484,7 @@ impl ::protobuf::Message for OriginalAudio { fn default_instance() -> &'static OriginalAudio { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(OriginalAudio::new) - } + unsafe { instance.get(OriginalAudio::new) } } } @@ -9684,16 +10634,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x01\x20\x01(\x0cB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/playlist4changes.rs b/protocol/src/playlist4changes.rs index 7022f152..834eb3ed 100644 --- a/protocol/src/playlist4changes.rs +++ b/protocol/src/playlist4changes.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ChangeInfo { // message fields user: ::protobuf::SingularField<::std::string::String>, @@ -55,7 +55,6 @@ impl ChangeInfo { // optional string user = 1; - pub fn get_user(&self) -> &str { match self.user.as_ref() { Some(v) => &v, @@ -86,12 +85,13 @@ impl ChangeInfo { // Take field pub fn take_user(&mut self) -> ::std::string::String { - self.user.take().unwrap_or_else(|| ::std::string::String::new()) + self.user + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional int32 timestamp = 2; - pub fn get_timestamp(&self) -> i32 { self.timestamp.unwrap_or(0) } @@ -110,7 +110,6 @@ impl ChangeInfo { // optional bool admin = 3; - pub fn get_admin(&self) -> bool { self.admin.unwrap_or(false) } @@ -129,7 +128,6 @@ impl ChangeInfo { // optional bool undo = 4; - pub fn get_undo(&self) -> bool { self.undo.unwrap_or(false) } @@ -148,7 +146,6 @@ impl ChangeInfo { // optional bool redo = 5; - pub fn get_redo(&self) -> bool { self.redo.unwrap_or(false) } @@ -167,7 +164,6 @@ impl ChangeInfo { // optional bool merge = 6; - pub fn get_merge(&self) -> bool { self.merge.unwrap_or(false) } @@ -186,7 +182,6 @@ impl ChangeInfo { // optional bool compressed = 7; - pub fn get_compressed(&self) -> bool { self.compressed.unwrap_or(false) } @@ -205,7 +200,6 @@ impl ChangeInfo { // optional bool migration = 8; - pub fn get_migration(&self) -> bool { self.migration.unwrap_or(false) } @@ -228,65 +222,87 @@ impl ::protobuf::Message for ChangeInfo { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.user)?; - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.timestamp = ::std::option::Option::Some(tmp); - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.admin = ::std::option::Option::Some(tmp); - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.undo = ::std::option::Option::Some(tmp); - }, + } 5 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.redo = ::std::option::Option::Some(tmp); - }, + } 6 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.merge = ::std::option::Option::Some(tmp); - }, + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.compressed = ::std::option::Option::Some(tmp); - }, + } 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.migration = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -325,7 +341,10 @@ impl ::protobuf::Message for ChangeInfo { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.user.as_ref() { os.write_string(1, &v)?; } @@ -385,54 +404,81 @@ impl ::protobuf::Message for ChangeInfo { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "user", - |m: &ChangeInfo| { &m.user }, - |m: &mut ChangeInfo| { &mut m.user }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "user", + |m: &ChangeInfo| &m.user, + |m: &mut ChangeInfo| &mut m.user, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "timestamp", - |m: &ChangeInfo| { &m.timestamp }, - |m: &mut ChangeInfo| { &mut m.timestamp }, + |m: &ChangeInfo| &m.timestamp, + |m: &mut ChangeInfo| &mut m.timestamp, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "admin", - |m: &ChangeInfo| { &m.admin }, - |m: &mut ChangeInfo| { &mut m.admin }, + |m: &ChangeInfo| &m.admin, + |m: &mut ChangeInfo| &mut m.admin, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "undo", - |m: &ChangeInfo| { &m.undo }, - |m: &mut ChangeInfo| { &mut m.undo }, + |m: &ChangeInfo| &m.undo, + |m: &mut ChangeInfo| &mut m.undo, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "redo", - |m: &ChangeInfo| { &m.redo }, - |m: &mut ChangeInfo| { &mut m.redo }, + |m: &ChangeInfo| &m.redo, + |m: &mut ChangeInfo| &mut m.redo, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "merge", - |m: &ChangeInfo| { &m.merge }, - |m: &mut ChangeInfo| { &mut m.merge }, + |m: &ChangeInfo| &m.merge, + |m: &mut ChangeInfo| &mut m.merge, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "compressed", - |m: &ChangeInfo| { &m.compressed }, - |m: &mut ChangeInfo| { &mut m.compressed }, + |m: &ChangeInfo| &m.compressed, + |m: &mut ChangeInfo| &mut m.compressed, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "migration", - |m: &ChangeInfo| { &m.migration }, - |m: &mut ChangeInfo| { &mut m.migration }, + |m: &ChangeInfo| &m.migration, + |m: &mut ChangeInfo| &mut m.migration, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ChangeInfo", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -440,9 +486,7 @@ impl ::protobuf::Message for ChangeInfo { fn default_instance() -> &'static ChangeInfo { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ChangeInfo::new) - } + unsafe { instance.get(ChangeInfo::new) } } } @@ -472,7 +516,7 @@ impl ::protobuf::reflect::ProtobufValue for ChangeInfo { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Delta { // message fields base_version: ::protobuf::SingularField<::std::vec::Vec>, @@ -496,7 +540,6 @@ impl Delta { // optional bytes base_version = 1; - pub fn get_base_version(&self) -> &[u8] { match self.base_version.as_ref() { Some(v) => &v, @@ -527,12 +570,13 @@ impl Delta { // Take field pub fn take_base_version(&mut self) -> ::std::vec::Vec { - self.base_version.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.base_version + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // repeated .Op ops = 2; - pub fn get_ops(&self) -> &[super::playlist4ops::Op] { &self.ops } @@ -557,9 +601,10 @@ impl Delta { // optional .ChangeInfo info = 4; - pub fn get_info(&self) -> &ChangeInfo { - self.info.as_ref().unwrap_or_else(|| ChangeInfo::default_instance()) + self.info + .as_ref() + .unwrap_or_else(|| ChangeInfo::default_instance()) } pub fn clear_info(&mut self) { self.info.clear(); @@ -595,31 +640,43 @@ impl ::protobuf::Message for Delta { if !v.is_initialized() { return false; } - }; + } for v in &self.info { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.base_version)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.base_version, + )?; + } 2 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.ops)?; - }, + } 4 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.info)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -635,7 +692,7 @@ impl ::protobuf::Message for Delta { for value in &self.ops { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.info.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -645,7 +702,10 @@ impl ::protobuf::Message for Delta { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.base_version.as_ref() { os.write_bytes(1, &v)?; } @@ -653,7 +713,7 @@ impl ::protobuf::Message for Delta { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.info.as_ref() { os.write_tag(4, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -694,29 +754,37 @@ impl ::protobuf::Message for Delta { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "base_version", - |m: &Delta| { &m.base_version }, - |m: &mut Delta| { &mut m.base_version }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "ops", - |m: &Delta| { &m.ops }, - |m: &mut Delta| { &mut m.ops }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "info", - |m: &Delta| { &m.info }, - |m: &mut Delta| { &mut m.info }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "base_version", + |m: &Delta| &m.base_version, + |m: &mut Delta| &mut m.base_version, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("ops", |m: &Delta| &m.ops, |m: &mut Delta| &mut m.ops), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("info", |m: &Delta| &m.info, |m: &mut Delta| &mut m.info), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Delta", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -724,9 +792,7 @@ impl ::protobuf::Message for Delta { fn default_instance() -> &'static Delta { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Delta::new) - } + unsafe { instance.get(Delta::new) } } } @@ -751,7 +817,7 @@ impl ::protobuf::reflect::ProtobufValue for Delta { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Merge { // message fields base_version: ::protobuf::SingularField<::std::vec::Vec>, @@ -775,7 +841,6 @@ impl Merge { // optional bytes base_version = 1; - pub fn get_base_version(&self) -> &[u8] { match self.base_version.as_ref() { Some(v) => &v, @@ -806,12 +871,13 @@ impl Merge { // Take field pub fn take_base_version(&mut self) -> ::std::vec::Vec { - self.base_version.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.base_version + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bytes merge_version = 2; - pub fn get_merge_version(&self) -> &[u8] { match self.merge_version.as_ref() { Some(v) => &v, @@ -842,14 +908,17 @@ impl Merge { // Take field pub fn take_merge_version(&mut self) -> ::std::vec::Vec { - self.merge_version.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.merge_version + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional .ChangeInfo info = 4; - pub fn get_info(&self) -> &ChangeInfo { - self.info.as_ref().unwrap_or_else(|| ChangeInfo::default_instance()) + self.info + .as_ref() + .unwrap_or_else(|| ChangeInfo::default_instance()) } pub fn clear_info(&mut self) { self.info.clear(); @@ -885,26 +954,42 @@ impl ::protobuf::Message for Merge { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.base_version)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.base_version, + )?; + } 2 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.merge_version)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.merge_version, + )?; + } 4 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.info)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -929,7 +1014,10 @@ impl ::protobuf::Message for Merge { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.base_version.as_ref() { os.write_bytes(1, &v)?; } @@ -976,29 +1064,41 @@ impl ::protobuf::Message for Merge { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "base_version", - |m: &Merge| { &m.base_version }, - |m: &mut Merge| { &mut m.base_version }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "merge_version", - |m: &Merge| { &m.merge_version }, - |m: &mut Merge| { &mut m.merge_version }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "info", - |m: &Merge| { &m.info }, - |m: &mut Merge| { &mut m.info }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "base_version", + |m: &Merge| &m.base_version, + |m: &mut Merge| &mut m.base_version, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "merge_version", + |m: &Merge| &m.merge_version, + |m: &mut Merge| &mut m.merge_version, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("info", |m: &Merge| &m.info, |m: &mut Merge| &mut m.info), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Merge", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1006,9 +1106,7 @@ impl ::protobuf::Message for Merge { fn default_instance() -> &'static Merge { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Merge::new) - } + unsafe { instance.get(Merge::new) } } } @@ -1033,7 +1131,7 @@ impl ::protobuf::reflect::ProtobufValue for Merge { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ChangeSet { // message fields kind: ::std::option::Option, @@ -1057,7 +1155,6 @@ impl ChangeSet { // optional .ChangeSet.Kind kind = 1; - pub fn get_kind(&self) -> ChangeSet_Kind { self.kind.unwrap_or(ChangeSet_Kind::KIND_UNKNOWN) } @@ -1076,9 +1173,10 @@ impl ChangeSet { // optional .Delta delta = 2; - pub fn get_delta(&self) -> &Delta { - self.delta.as_ref().unwrap_or_else(|| Delta::default_instance()) + self.delta + .as_ref() + .unwrap_or_else(|| Delta::default_instance()) } pub fn clear_delta(&mut self) { self.delta.clear(); @@ -1109,9 +1207,10 @@ impl ChangeSet { // optional .Merge merge = 3; - pub fn get_merge(&self) -> &Merge { - self.merge.as_ref().unwrap_or_else(|| Merge::default_instance()) + self.merge + .as_ref() + .unwrap_or_else(|| Merge::default_instance()) } pub fn clear_merge(&mut self) { self.merge.clear(); @@ -1147,31 +1246,43 @@ impl ::protobuf::Message for ChangeSet { if !v.is_initialized() { return false; } - }; + } for v in &self.merge { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.kind, 1, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.kind, + 1, + &mut self.unknown_fields, + )?, 2 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.delta)?; - }, + } 3 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.merge)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1197,7 +1308,10 @@ impl ::protobuf::Message for ChangeSet { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.kind { os.write_enum(1, v.value())?; } @@ -1246,29 +1360,43 @@ impl ::protobuf::Message for ChangeSet { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "kind", - |m: &ChangeSet| { &m.kind }, - |m: &mut ChangeSet| { &mut m.kind }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "delta", - |m: &ChangeSet| { &m.delta }, - |m: &mut ChangeSet| { &mut m.delta }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "merge", - |m: &ChangeSet| { &m.merge }, - |m: &mut ChangeSet| { &mut m.merge }, + |m: &ChangeSet| &m.kind, + |m: &mut ChangeSet| &mut m.kind, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "delta", + |m: &ChangeSet| &m.delta, + |m: &mut ChangeSet| &mut m.delta, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "merge", + |m: &ChangeSet| &m.merge, + |m: &mut ChangeSet| &mut m.merge, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ChangeSet", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1276,9 +1404,7 @@ impl ::protobuf::Message for ChangeSet { fn default_instance() -> &'static ChangeSet { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ChangeSet::new) - } + unsafe { instance.get(ChangeSet::new) } } } @@ -1303,7 +1429,7 @@ impl ::protobuf::reflect::ProtobufValue for ChangeSet { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ChangeSet_Kind { KIND_UNKNOWN = 0, DELTA = 2, @@ -1320,7 +1446,7 @@ impl ::protobuf::ProtobufEnum for ChangeSet_Kind { 0 => ::std::option::Option::Some(ChangeSet_Kind::KIND_UNKNOWN), 2 => ::std::option::Option::Some(ChangeSet_Kind::DELTA), 3 => ::std::option::Option::Some(ChangeSet_Kind::MERGE), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -1334,17 +1460,20 @@ impl ::protobuf::ProtobufEnum for ChangeSet_Kind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ChangeSet.Kind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ChangeSet.Kind", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ChangeSet_Kind { -} +impl ::std::marker::Copy for ChangeSet_Kind {} impl ::std::default::Default for ChangeSet_Kind { fn default() -> Self { @@ -1358,7 +1487,7 @@ impl ::protobuf::reflect::ProtobufValue for ChangeSet_Kind { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct RevisionTaggedChangeSet { // message fields revision: ::protobuf::SingularField<::std::vec::Vec>, @@ -1381,7 +1510,6 @@ impl RevisionTaggedChangeSet { // optional bytes revision = 1; - pub fn get_revision(&self) -> &[u8] { match self.revision.as_ref() { Some(v) => &v, @@ -1412,14 +1540,17 @@ impl RevisionTaggedChangeSet { // Take field pub fn take_revision(&mut self) -> ::std::vec::Vec { - self.revision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.revision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional .ChangeSet change_set = 2; - pub fn get_change_set(&self) -> &ChangeSet { - self.change_set.as_ref().unwrap_or_else(|| ChangeSet::default_instance()) + self.change_set + .as_ref() + .unwrap_or_else(|| ChangeSet::default_instance()) } pub fn clear_change_set(&mut self) { self.change_set.clear(); @@ -1455,23 +1586,35 @@ impl ::protobuf::Message for RevisionTaggedChangeSet { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.revision)?; - }, + } 2 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.change_set)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.change_set, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1493,7 +1636,10 @@ impl ::protobuf::Message for RevisionTaggedChangeSet { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.revision.as_ref() { os.write_bytes(1, &v)?; } @@ -1537,34 +1683,44 @@ impl ::protobuf::Message for RevisionTaggedChangeSet { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "revision", - |m: &RevisionTaggedChangeSet| { &m.revision }, - |m: &mut RevisionTaggedChangeSet| { &mut m.revision }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "change_set", - |m: &RevisionTaggedChangeSet| { &m.change_set }, - |m: &mut RevisionTaggedChangeSet| { &mut m.change_set }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "revision", + |m: &RevisionTaggedChangeSet| &m.revision, + |m: &mut RevisionTaggedChangeSet| &mut m.revision, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "change_set", + |m: &RevisionTaggedChangeSet| &m.change_set, + |m: &mut RevisionTaggedChangeSet| &mut m.change_set, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "RevisionTaggedChangeSet", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static RevisionTaggedChangeSet { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(RevisionTaggedChangeSet::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(RevisionTaggedChangeSet::new) } } } @@ -1588,7 +1744,7 @@ impl ::protobuf::reflect::ProtobufValue for RevisionTaggedChangeSet { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Diff { // message fields from_revision: ::protobuf::SingularField<::std::vec::Vec>, @@ -1612,7 +1768,6 @@ impl Diff { // optional bytes from_revision = 1; - pub fn get_from_revision(&self) -> &[u8] { match self.from_revision.as_ref() { Some(v) => &v, @@ -1643,12 +1798,13 @@ impl Diff { // Take field pub fn take_from_revision(&mut self) -> ::std::vec::Vec { - self.from_revision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.from_revision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // repeated .Op ops = 2; - pub fn get_ops(&self) -> &[super::playlist4ops::Op] { &self.ops } @@ -1673,7 +1829,6 @@ impl Diff { // optional bytes to_revision = 3; - pub fn get_to_revision(&self) -> &[u8] { match self.to_revision.as_ref() { Some(v) => &v, @@ -1704,7 +1859,9 @@ impl Diff { // Take field pub fn take_to_revision(&mut self) -> ::std::vec::Vec { - self.to_revision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.to_revision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } } @@ -1714,26 +1871,38 @@ impl ::protobuf::Message for Diff { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.from_revision)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.from_revision, + )?; + } 2 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.ops)?; - }, + } 3 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.to_revision)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1749,7 +1918,7 @@ impl ::protobuf::Message for Diff { for value in &self.ops { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.to_revision.as_ref() { my_size += ::protobuf::rt::bytes_size(3, &v); } @@ -1758,7 +1927,10 @@ impl ::protobuf::Message for Diff { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.from_revision.as_ref() { os.write_bytes(1, &v)?; } @@ -1766,7 +1938,7 @@ impl ::protobuf::Message for Diff { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.to_revision.as_ref() { os.write_bytes(3, &v)?; } @@ -1805,29 +1977,41 @@ impl ::protobuf::Message for Diff { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "from_revision", - |m: &Diff| { &m.from_revision }, - |m: &mut Diff| { &mut m.from_revision }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "ops", - |m: &Diff| { &m.ops }, - |m: &mut Diff| { &mut m.ops }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "to_revision", - |m: &Diff| { &m.to_revision }, - |m: &mut Diff| { &mut m.to_revision }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "from_revision", + |m: &Diff| &m.from_revision, + |m: &mut Diff| &mut m.from_revision, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("ops", |m: &Diff| &m.ops, |m: &mut Diff| &mut m.ops), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "to_revision", + |m: &Diff| &m.to_revision, + |m: &mut Diff| &mut m.to_revision, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Diff", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1835,9 +2019,7 @@ impl ::protobuf::Message for Diff { fn default_instance() -> &'static Diff { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Diff::new) - } + unsafe { instance.get(Diff::new) } } } @@ -1862,7 +2044,7 @@ impl ::protobuf::reflect::ProtobufValue for Diff { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListDump { // message fields latestRevision: ::protobuf::SingularField<::std::vec::Vec>, @@ -1889,7 +2071,6 @@ impl ListDump { // optional bytes latestRevision = 1; - pub fn get_latestRevision(&self) -> &[u8] { match self.latestRevision.as_ref() { Some(v) => &v, @@ -1920,12 +2101,13 @@ impl ListDump { // Take field pub fn take_latestRevision(&mut self) -> ::std::vec::Vec { - self.latestRevision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.latestRevision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional int32 length = 2; - pub fn get_length(&self) -> i32 { self.length.unwrap_or(0) } @@ -1944,9 +2126,10 @@ impl ListDump { // optional .ListAttributes attributes = 3; - pub fn get_attributes(&self) -> &super::playlist4meta::ListAttributes { - self.attributes.as_ref().unwrap_or_else(|| super::playlist4meta::ListAttributes::default_instance()) + self.attributes + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListAttributes::default_instance()) } pub fn clear_attributes(&mut self) { self.attributes.clear(); @@ -1972,14 +2155,17 @@ impl ListDump { // Take field pub fn take_attributes(&mut self) -> super::playlist4meta::ListAttributes { - self.attributes.take().unwrap_or_else(|| super::playlist4meta::ListAttributes::new()) + self.attributes + .take() + .unwrap_or_else(|| super::playlist4meta::ListAttributes::new()) } // optional .ListChecksum checksum = 4; - pub fn get_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_checksum(&mut self) { self.checksum.clear(); @@ -2005,14 +2191,17 @@ impl ListDump { // Take field pub fn take_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListItems contents = 5; - pub fn get_contents(&self) -> &super::playlist4content::ListItems { - self.contents.as_ref().unwrap_or_else(|| super::playlist4content::ListItems::default_instance()) + self.contents + .as_ref() + .unwrap_or_else(|| super::playlist4content::ListItems::default_instance()) } pub fn clear_contents(&mut self) { self.contents.clear(); @@ -2038,12 +2227,13 @@ impl ListDump { // Take field pub fn take_contents(&mut self) -> super::playlist4content::ListItems { - self.contents.take().unwrap_or_else(|| super::playlist4content::ListItems::new()) + self.contents + .take() + .unwrap_or_else(|| super::playlist4content::ListItems::new()) } // repeated .Delta pendingDeltas = 7; - pub fn get_pendingDeltas(&self) -> &[Delta] { &self.pendingDeltas } @@ -2073,54 +2263,76 @@ impl ::protobuf::Message for ListDump { if !v.is_initialized() { return false; } - }; + } for v in &self.checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.contents { if !v.is_initialized() { return false; } - }; + } for v in &self.pendingDeltas { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.latestRevision)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.latestRevision, + )?; + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.length = ::std::option::Option::Some(tmp); - }, + } 3 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.attributes, + )?; + } 4 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.checksum)?; - }, + } 5 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.contents)?; - }, + } 7 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.pendingDeltas)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.pendingDeltas, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2151,13 +2363,16 @@ impl ::protobuf::Message for ListDump { for value in &self.pendingDeltas { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.latestRevision.as_ref() { os.write_bytes(1, &v)?; } @@ -2183,7 +2398,7 @@ impl ::protobuf::Message for ListDump { os.write_tag(7, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -2219,44 +2434,75 @@ impl ::protobuf::Message for ListDump { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "latestRevision", - |m: &ListDump| { &m.latestRevision }, - |m: &mut ListDump| { &mut m.latestRevision }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "latestRevision", + |m: &ListDump| &m.latestRevision, + |m: &mut ListDump| &mut m.latestRevision, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "length", - |m: &ListDump| { &m.length }, - |m: &mut ListDump| { &mut m.length }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "attributes", - |m: &ListDump| { &m.attributes }, - |m: &mut ListDump| { &mut m.attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "checksum", - |m: &ListDump| { &m.checksum }, - |m: &mut ListDump| { &mut m.checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "contents", - |m: &ListDump| { &m.contents }, - |m: &mut ListDump| { &mut m.contents }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "pendingDeltas", - |m: &ListDump| { &m.pendingDeltas }, - |m: &mut ListDump| { &mut m.pendingDeltas }, + |m: &ListDump| &m.length, + |m: &mut ListDump| &mut m.length, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4meta::ListAttributes, + >, + >( + "attributes", + |m: &ListDump| &m.attributes, + |m: &mut ListDump| &mut m.attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "checksum", + |m: &ListDump| &m.checksum, + |m: &mut ListDump| &mut m.checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "contents", + |m: &ListDump| &m.contents, + |m: &mut ListDump| &mut m.contents, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "pendingDeltas", + |m: &ListDump| &m.pendingDeltas, + |m: &mut ListDump| &mut m.pendingDeltas, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListDump", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2264,9 +2510,7 @@ impl ::protobuf::Message for ListDump { fn default_instance() -> &'static ListDump { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListDump::new) - } + unsafe { instance.get(ListDump::new) } } } @@ -2294,7 +2538,7 @@ impl ::protobuf::reflect::ProtobufValue for ListDump { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListChanges { // message fields baseRevision: ::protobuf::SingularField<::std::vec::Vec>, @@ -2321,7 +2565,6 @@ impl ListChanges { // optional bytes baseRevision = 1; - pub fn get_baseRevision(&self) -> &[u8] { match self.baseRevision.as_ref() { Some(v) => &v, @@ -2352,12 +2595,13 @@ impl ListChanges { // Take field pub fn take_baseRevision(&mut self) -> ::std::vec::Vec { - self.baseRevision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.baseRevision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // repeated .Delta deltas = 2; - pub fn get_deltas(&self) -> &[Delta] { &self.deltas } @@ -2382,7 +2626,6 @@ impl ListChanges { // optional bool wantResultingRevisions = 3; - pub fn get_wantResultingRevisions(&self) -> bool { self.wantResultingRevisions.unwrap_or(false) } @@ -2401,7 +2644,6 @@ impl ListChanges { // optional bool wantSyncResult = 4; - pub fn get_wantSyncResult(&self) -> bool { self.wantSyncResult.unwrap_or(false) } @@ -2420,9 +2662,10 @@ impl ListChanges { // optional .ListDump dump = 5; - pub fn get_dump(&self) -> &ListDump { - self.dump.as_ref().unwrap_or_else(|| ListDump::default_instance()) + self.dump + .as_ref() + .unwrap_or_else(|| ListDump::default_instance()) } pub fn clear_dump(&mut self) { self.dump.clear(); @@ -2453,7 +2696,6 @@ impl ListChanges { // repeated int32 nonces = 6; - pub fn get_nonces(&self) -> &[i32] { &self.nonces } @@ -2483,48 +2725,64 @@ impl ::protobuf::Message for ListChanges { if !v.is_initialized() { return false; } - }; + } for v in &self.dump { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.baseRevision)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.baseRevision, + )?; + } 2 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.deltas)?; - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantResultingRevisions = ::std::option::Option::Some(tmp); - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantSyncResult = ::std::option::Option::Some(tmp); - }, + } 5 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.dump)?; - }, + } 6 => { ::protobuf::rt::read_repeated_int32_into(wire_type, is, &mut self.nonces)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2540,7 +2798,7 @@ impl ::protobuf::Message for ListChanges { for value in &self.deltas { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(v) = self.wantResultingRevisions { my_size += 2; } @@ -2552,14 +2810,18 @@ impl ::protobuf::Message for ListChanges { my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; } for value in &self.nonces { - my_size += ::protobuf::rt::value_size(6, *value, ::protobuf::wire_format::WireTypeVarint); - }; + my_size += + ::protobuf::rt::value_size(6, *value, ::protobuf::wire_format::WireTypeVarint); + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.baseRevision.as_ref() { os.write_bytes(1, &v)?; } @@ -2567,7 +2829,7 @@ impl ::protobuf::Message for ListChanges { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(v) = self.wantResultingRevisions { os.write_bool(3, v)?; } @@ -2581,7 +2843,7 @@ impl ::protobuf::Message for ListChanges { } for v in &self.nonces { os.write_int32(6, *v)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -2617,44 +2879,69 @@ impl ::protobuf::Message for ListChanges { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "baseRevision", - |m: &ListChanges| { &m.baseRevision }, - |m: &mut ListChanges| { &mut m.baseRevision }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "deltas", - |m: &ListChanges| { &m.deltas }, - |m: &mut ListChanges| { &mut m.deltas }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "baseRevision", + |m: &ListChanges| &m.baseRevision, + |m: &mut ListChanges| &mut m.baseRevision, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "deltas", + |m: &ListChanges| &m.deltas, + |m: &mut ListChanges| &mut m.deltas, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantResultingRevisions", - |m: &ListChanges| { &m.wantResultingRevisions }, - |m: &mut ListChanges| { &mut m.wantResultingRevisions }, + |m: &ListChanges| &m.wantResultingRevisions, + |m: &mut ListChanges| &mut m.wantResultingRevisions, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantSyncResult", - |m: &ListChanges| { &m.wantSyncResult }, - |m: &mut ListChanges| { &mut m.wantSyncResult }, + |m: &ListChanges| &m.wantSyncResult, + |m: &mut ListChanges| &mut m.wantSyncResult, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "dump", - |m: &ListChanges| { &m.dump }, - |m: &mut ListChanges| { &mut m.dump }, - )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "dump", + |m: &ListChanges| &m.dump, + |m: &mut ListChanges| &mut m.dump, + ), + ); + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "nonces", - |m: &ListChanges| { &m.nonces }, - |m: &mut ListChanges| { &mut m.nonces }, + |m: &ListChanges| &m.nonces, + |m: &mut ListChanges| &mut m.nonces, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListChanges", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2662,9 +2949,7 @@ impl ::protobuf::Message for ListChanges { fn default_instance() -> &'static ListChanges { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListChanges::new) - } + unsafe { instance.get(ListChanges::new) } } } @@ -2692,7 +2977,7 @@ impl ::protobuf::reflect::ProtobufValue for ListChanges { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct SelectedListContent { // message fields revision: ::protobuf::SingularField<::std::vec::Vec>, @@ -2727,7 +3012,6 @@ impl SelectedListContent { // optional bytes revision = 1; - pub fn get_revision(&self) -> &[u8] { match self.revision.as_ref() { Some(v) => &v, @@ -2758,12 +3042,13 @@ impl SelectedListContent { // Take field pub fn take_revision(&mut self) -> ::std::vec::Vec { - self.revision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.revision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional int32 length = 2; - pub fn get_length(&self) -> i32 { self.length.unwrap_or(0) } @@ -2782,9 +3067,10 @@ impl SelectedListContent { // optional .ListAttributes attributes = 3; - pub fn get_attributes(&self) -> &super::playlist4meta::ListAttributes { - self.attributes.as_ref().unwrap_or_else(|| super::playlist4meta::ListAttributes::default_instance()) + self.attributes + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListAttributes::default_instance()) } pub fn clear_attributes(&mut self) { self.attributes.clear(); @@ -2810,14 +3096,17 @@ impl SelectedListContent { // Take field pub fn take_attributes(&mut self) -> super::playlist4meta::ListAttributes { - self.attributes.take().unwrap_or_else(|| super::playlist4meta::ListAttributes::new()) + self.attributes + .take() + .unwrap_or_else(|| super::playlist4meta::ListAttributes::new()) } // optional .ListChecksum checksum = 4; - pub fn get_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_checksum(&mut self) { self.checksum.clear(); @@ -2843,14 +3132,17 @@ impl SelectedListContent { // Take field pub fn take_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListItems contents = 5; - pub fn get_contents(&self) -> &super::playlist4content::ListItems { - self.contents.as_ref().unwrap_or_else(|| super::playlist4content::ListItems::default_instance()) + self.contents + .as_ref() + .unwrap_or_else(|| super::playlist4content::ListItems::default_instance()) } pub fn clear_contents(&mut self) { self.contents.clear(); @@ -2876,14 +3168,17 @@ impl SelectedListContent { // Take field pub fn take_contents(&mut self) -> super::playlist4content::ListItems { - self.contents.take().unwrap_or_else(|| super::playlist4content::ListItems::new()) + self.contents + .take() + .unwrap_or_else(|| super::playlist4content::ListItems::new()) } // optional .Diff diff = 6; - pub fn get_diff(&self) -> &Diff { - self.diff.as_ref().unwrap_or_else(|| Diff::default_instance()) + self.diff + .as_ref() + .unwrap_or_else(|| Diff::default_instance()) } pub fn clear_diff(&mut self) { self.diff.clear(); @@ -2914,9 +3209,10 @@ impl SelectedListContent { // optional .Diff syncResult = 7; - pub fn get_syncResult(&self) -> &Diff { - self.syncResult.as_ref().unwrap_or_else(|| Diff::default_instance()) + self.syncResult + .as_ref() + .unwrap_or_else(|| Diff::default_instance()) } pub fn clear_syncResult(&mut self) { self.syncResult.clear(); @@ -2947,7 +3243,6 @@ impl SelectedListContent { // repeated bytes resultingRevisions = 8; - pub fn get_resultingRevisions(&self) -> &[::std::vec::Vec] { &self.resultingRevisions } @@ -2961,18 +3256,22 @@ impl SelectedListContent { } // Mutable pointer to the field. - pub fn mut_resultingRevisions(&mut self) -> &mut ::protobuf::RepeatedField<::std::vec::Vec> { + pub fn mut_resultingRevisions( + &mut self, + ) -> &mut ::protobuf::RepeatedField<::std::vec::Vec> { &mut self.resultingRevisions } // Take field pub fn take_resultingRevisions(&mut self) -> ::protobuf::RepeatedField<::std::vec::Vec> { - ::std::mem::replace(&mut self.resultingRevisions, ::protobuf::RepeatedField::new()) + ::std::mem::replace( + &mut self.resultingRevisions, + ::protobuf::RepeatedField::new(), + ) } // optional bool multipleHeads = 9; - pub fn get_multipleHeads(&self) -> bool { self.multipleHeads.unwrap_or(false) } @@ -2991,7 +3290,6 @@ impl SelectedListContent { // optional bool upToDate = 10; - pub fn get_upToDate(&self) -> bool { self.upToDate.unwrap_or(false) } @@ -3010,7 +3308,6 @@ impl SelectedListContent { // repeated .ClientResolveAction resolveAction = 12; - pub fn get_resolveAction(&self) -> &[super::playlist4issues::ClientResolveAction] { &self.resolveAction } @@ -3019,23 +3316,29 @@ impl SelectedListContent { } // Param is passed by value, moved - pub fn set_resolveAction(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_resolveAction( + &mut self, + v: ::protobuf::RepeatedField, + ) { self.resolveAction = v; } // Mutable pointer to the field. - pub fn mut_resolveAction(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_resolveAction( + &mut self, + ) -> &mut ::protobuf::RepeatedField { &mut self.resolveAction } // Take field - pub fn take_resolveAction(&mut self) -> ::protobuf::RepeatedField { + pub fn take_resolveAction( + &mut self, + ) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.resolveAction, ::protobuf::RepeatedField::new()) } // repeated .ClientIssue issues = 13; - pub fn get_issues(&self) -> &[super::playlist4issues::ClientIssue] { &self.issues } @@ -3044,23 +3347,29 @@ impl SelectedListContent { } // Param is passed by value, moved - pub fn set_issues(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_issues( + &mut self, + v: ::protobuf::RepeatedField, + ) { self.issues = v; } // Mutable pointer to the field. - pub fn mut_issues(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_issues( + &mut self, + ) -> &mut ::protobuf::RepeatedField { &mut self.issues } // Take field - pub fn take_issues(&mut self) -> ::protobuf::RepeatedField { + pub fn take_issues( + &mut self, + ) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.issues, ::protobuf::RepeatedField::new()) } // repeated int32 nonces = 14; - pub fn get_nonces(&self) -> &[i32] { &self.nonces } @@ -3085,7 +3394,6 @@ impl SelectedListContent { // optional string owner_username = 16; - pub fn get_owner_username(&self) -> &str { match self.owner_username.as_ref() { Some(v) => &v, @@ -3116,7 +3424,9 @@ impl SelectedListContent { // Take field pub fn take_owner_username(&mut self) -> ::std::string::String { - self.owner_username.take().unwrap_or_else(|| ::std::string::String::new()) + self.owner_username + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -3126,101 +3436,135 @@ impl ::protobuf::Message for SelectedListContent { if !v.is_initialized() { return false; } - }; + } for v in &self.checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.contents { if !v.is_initialized() { return false; } - }; + } for v in &self.diff { if !v.is_initialized() { return false; } - }; + } for v in &self.syncResult { if !v.is_initialized() { return false; } - }; + } for v in &self.resolveAction { if !v.is_initialized() { return false; } - }; + } for v in &self.issues { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.revision)?; - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.length = ::std::option::Option::Some(tmp); - }, + } 3 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.attributes, + )?; + } 4 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.checksum)?; - }, + } 5 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.contents)?; - }, + } 6 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.diff)?; - }, + } 7 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.syncResult)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.syncResult, + )?; + } 8 => { - ::protobuf::rt::read_repeated_bytes_into(wire_type, is, &mut self.resultingRevisions)?; - }, + ::protobuf::rt::read_repeated_bytes_into( + wire_type, + is, + &mut self.resultingRevisions, + )?; + } 9 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.multipleHeads = ::std::option::Option::Some(tmp); - }, + } 10 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.upToDate = ::std::option::Option::Some(tmp); - }, + } 12 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.resolveAction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.resolveAction, + )?; + } 13 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.issues)?; - }, + } 14 => { ::protobuf::rt::read_repeated_int32_into(wire_type, is, &mut self.nonces)?; - }, + } 16 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.owner_username)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.owner_username, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3258,7 +3602,7 @@ impl ::protobuf::Message for SelectedListContent { } for value in &self.resultingRevisions { my_size += ::protobuf::rt::bytes_size(8, &value); - }; + } if let Some(v) = self.multipleHeads { my_size += 2; } @@ -3268,14 +3612,15 @@ impl ::protobuf::Message for SelectedListContent { for value in &self.resolveAction { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.issues { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.nonces { - my_size += ::protobuf::rt::value_size(14, *value, ::protobuf::wire_format::WireTypeVarint); - }; + my_size += + ::protobuf::rt::value_size(14, *value, ::protobuf::wire_format::WireTypeVarint); + } if let Some(ref v) = self.owner_username.as_ref() { my_size += ::protobuf::rt::string_size(16, &v); } @@ -3284,7 +3629,10 @@ impl ::protobuf::Message for SelectedListContent { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.revision.as_ref() { os.write_bytes(1, &v)?; } @@ -3318,7 +3666,7 @@ impl ::protobuf::Message for SelectedListContent { } for v in &self.resultingRevisions { os.write_bytes(8, &v)?; - }; + } if let Some(v) = self.multipleHeads { os.write_bool(9, v)?; } @@ -3329,15 +3677,15 @@ impl ::protobuf::Message for SelectedListContent { os.write_tag(12, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.issues { os.write_tag(13, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.nonces { os.write_int32(14, *v)?; - }; + } if let Some(ref v) = self.owner_username.as_ref() { os.write_string(16, &v)?; } @@ -3376,94 +3724,160 @@ impl ::protobuf::Message for SelectedListContent { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "revision", - |m: &SelectedListContent| { &m.revision }, - |m: &mut SelectedListContent| { &mut m.revision }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "revision", + |m: &SelectedListContent| &m.revision, + |m: &mut SelectedListContent| &mut m.revision, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "length", - |m: &SelectedListContent| { &m.length }, - |m: &mut SelectedListContent| { &mut m.length }, + |m: &SelectedListContent| &m.length, + |m: &mut SelectedListContent| &mut m.length, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "attributes", - |m: &SelectedListContent| { &m.attributes }, - |m: &mut SelectedListContent| { &mut m.attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "checksum", - |m: &SelectedListContent| { &m.checksum }, - |m: &mut SelectedListContent| { &mut m.checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "contents", - |m: &SelectedListContent| { &m.contents }, - |m: &mut SelectedListContent| { &mut m.contents }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "diff", - |m: &SelectedListContent| { &m.diff }, - |m: &mut SelectedListContent| { &mut m.diff }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "syncResult", - |m: &SelectedListContent| { &m.syncResult }, - |m: &mut SelectedListContent| { &mut m.syncResult }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "resultingRevisions", - |m: &SelectedListContent| { &m.resultingRevisions }, - |m: &mut SelectedListContent| { &mut m.resultingRevisions }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4meta::ListAttributes, + >, + >( + "attributes", + |m: &SelectedListContent| &m.attributes, + |m: &mut SelectedListContent| &mut m.attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "checksum", + |m: &SelectedListContent| &m.checksum, + |m: &mut SelectedListContent| &mut m.checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "contents", + |m: &SelectedListContent| &m.contents, + |m: &mut SelectedListContent| &mut m.contents, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "diff", + |m: &SelectedListContent| &m.diff, + |m: &mut SelectedListContent| &mut m.diff, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "syncResult", + |m: &SelectedListContent| &m.syncResult, + |m: &mut SelectedListContent| &mut m.syncResult, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "resultingRevisions", + |m: &SelectedListContent| &m.resultingRevisions, + |m: &mut SelectedListContent| &mut m.resultingRevisions, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "multipleHeads", - |m: &SelectedListContent| { &m.multipleHeads }, - |m: &mut SelectedListContent| { &mut m.multipleHeads }, + |m: &SelectedListContent| &m.multipleHeads, + |m: &mut SelectedListContent| &mut m.multipleHeads, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "upToDate", - |m: &SelectedListContent| { &m.upToDate }, - |m: &mut SelectedListContent| { &mut m.upToDate }, + |m: &SelectedListContent| &m.upToDate, + |m: &mut SelectedListContent| &mut m.upToDate, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "resolveAction", - |m: &SelectedListContent| { &m.resolveAction }, - |m: &mut SelectedListContent| { &mut m.resolveAction }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "issues", - |m: &SelectedListContent| { &m.issues }, - |m: &mut SelectedListContent| { &mut m.issues }, - )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4issues::ClientResolveAction, + >, + >( + "resolveAction", + |m: &SelectedListContent| &m.resolveAction, + |m: &mut SelectedListContent| &mut m.resolveAction, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "issues", + |m: &SelectedListContent| &m.issues, + |m: &mut SelectedListContent| &mut m.issues, + ), + ); + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "nonces", - |m: &SelectedListContent| { &m.nonces }, - |m: &mut SelectedListContent| { &mut m.nonces }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "owner_username", - |m: &SelectedListContent| { &m.owner_username }, - |m: &mut SelectedListContent| { &mut m.owner_username }, + |m: &SelectedListContent| &m.nonces, + |m: &mut SelectedListContent| &mut m.nonces, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "owner_username", + |m: &SelectedListContent| &m.owner_username, + |m: &mut SelectedListContent| &mut m.owner_username, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "SelectedListContent", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static SelectedListContent { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(SelectedListContent::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(SelectedListContent::new) } } } @@ -3543,16 +3957,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x20\x01(\tB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/playlist4content.rs b/protocol/src/playlist4content.rs index 58b5bea3..5d672442 100644 --- a/protocol/src/playlist4content.rs +++ b/protocol/src/playlist4content.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Item { // message fields uri: ::protobuf::SingularField<::std::string::String>, @@ -49,7 +49,6 @@ impl Item { // optional string uri = 1; - pub fn get_uri(&self) -> &str { match self.uri.as_ref() { Some(v) => &v, @@ -80,14 +79,17 @@ impl Item { // Take field pub fn take_uri(&mut self) -> ::std::string::String { - self.uri.take().unwrap_or_else(|| ::std::string::String::new()) + self.uri + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .ItemAttributes attributes = 2; - pub fn get_attributes(&self) -> &super::playlist4meta::ItemAttributes { - self.attributes.as_ref().unwrap_or_else(|| super::playlist4meta::ItemAttributes::default_instance()) + self.attributes + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ItemAttributes::default_instance()) } pub fn clear_attributes(&mut self) { self.attributes.clear(); @@ -113,7 +115,9 @@ impl Item { // Take field pub fn take_attributes(&mut self) -> super::playlist4meta::ItemAttributes { - self.attributes.take().unwrap_or_else(|| super::playlist4meta::ItemAttributes::new()) + self.attributes + .take() + .unwrap_or_else(|| super::playlist4meta::ItemAttributes::new()) } } @@ -123,23 +127,35 @@ impl ::protobuf::Message for Item { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.uri)?; - }, + } 2 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.attributes, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -161,7 +177,10 @@ impl ::protobuf::Message for Item { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.uri.as_ref() { os.write_string(1, &v)?; } @@ -205,24 +224,33 @@ impl ::protobuf::Message for Item { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "uri", - |m: &Item| { &m.uri }, - |m: &mut Item| { &mut m.uri }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "attributes", - |m: &Item| { &m.attributes }, - |m: &mut Item| { &mut m.attributes }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >("uri", |m: &Item| &m.uri, |m: &mut Item| &mut m.uri), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4meta::ItemAttributes, + >, + >( + "attributes", + |m: &Item| &m.attributes, + |m: &mut Item| &mut m.attributes, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Item", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -230,9 +258,7 @@ impl ::protobuf::Message for Item { fn default_instance() -> &'static Item { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Item::new) - } + unsafe { instance.get(Item::new) } } } @@ -256,7 +282,7 @@ impl ::protobuf::reflect::ProtobufValue for Item { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListItems { // message fields pos: ::std::option::Option, @@ -280,7 +306,6 @@ impl ListItems { // optional int32 pos = 1; - pub fn get_pos(&self) -> i32 { self.pos.unwrap_or(0) } @@ -299,7 +324,6 @@ impl ListItems { // optional bool truncated = 2; - pub fn get_truncated(&self) -> bool { self.truncated.unwrap_or(false) } @@ -318,7 +342,6 @@ impl ListItems { // repeated .Item items = 3; - pub fn get_items(&self) -> &[Item] { &self.items } @@ -348,34 +371,46 @@ impl ::protobuf::Message for ListItems { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.pos = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.truncated = ::std::option::Option::Some(tmp); - }, + } 3 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.items)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -394,13 +429,16 @@ impl ::protobuf::Message for ListItems { for value in &self.items { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.pos { os.write_int32(1, v)?; } @@ -411,7 +449,7 @@ impl ::protobuf::Message for ListItems { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -447,29 +485,41 @@ impl ::protobuf::Message for ListItems { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "pos", - |m: &ListItems| { &m.pos }, - |m: &mut ListItems| { &mut m.pos }, + |m: &ListItems| &m.pos, + |m: &mut ListItems| &mut m.pos, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "truncated", - |m: &ListItems| { &m.truncated }, - |m: &mut ListItems| { &mut m.truncated }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "items", - |m: &ListItems| { &m.items }, - |m: &mut ListItems| { &mut m.items }, + |m: &ListItems| &m.truncated, + |m: &mut ListItems| &mut m.truncated, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "items", + |m: &ListItems| &m.items, + |m: &mut ListItems| &mut m.items, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListItems", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -477,9 +527,7 @@ impl ::protobuf::Message for ListItems { fn default_instance() -> &'static ListItems { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListItems::new) - } + unsafe { instance.get(ListItems::new) } } } @@ -504,7 +552,7 @@ impl ::protobuf::reflect::ProtobufValue for ListItems { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ContentRange { // message fields pos: ::std::option::Option, @@ -527,7 +575,6 @@ impl ContentRange { // optional int32 pos = 1; - pub fn get_pos(&self) -> i32 { self.pos.unwrap_or(0) } @@ -546,7 +593,6 @@ impl ContentRange { // optional int32 length = 2; - pub fn get_length(&self) -> i32 { self.length.unwrap_or(0) } @@ -569,27 +615,39 @@ impl ::protobuf::Message for ContentRange { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.pos = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.length = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -610,7 +668,10 @@ impl ::protobuf::Message for ContentRange { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.pos { os.write_int32(1, v)?; } @@ -652,24 +713,31 @@ impl ::protobuf::Message for ContentRange { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "pos", - |m: &ContentRange| { &m.pos }, - |m: &mut ContentRange| { &mut m.pos }, + |m: &ContentRange| &m.pos, + |m: &mut ContentRange| &mut m.pos, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "length", - |m: &ContentRange| { &m.length }, - |m: &mut ContentRange| { &mut m.length }, + |m: &ContentRange| &m.length, + |m: &mut ContentRange| &mut m.length, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ContentRange", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -677,9 +745,7 @@ impl ::protobuf::Message for ContentRange { fn default_instance() -> &'static ContentRange { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ContentRange::new) - } + unsafe { instance.get(ContentRange::new) } } } @@ -703,7 +769,7 @@ impl ::protobuf::reflect::ProtobufValue for ContentRange { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListContentSelection { // message fields wantRevision: ::std::option::Option, @@ -737,7 +803,6 @@ impl ListContentSelection { // optional bool wantRevision = 1; - pub fn get_wantRevision(&self) -> bool { self.wantRevision.unwrap_or(false) } @@ -756,7 +821,6 @@ impl ListContentSelection { // optional bool wantLength = 2; - pub fn get_wantLength(&self) -> bool { self.wantLength.unwrap_or(false) } @@ -775,7 +839,6 @@ impl ListContentSelection { // optional bool wantAttributes = 3; - pub fn get_wantAttributes(&self) -> bool { self.wantAttributes.unwrap_or(false) } @@ -794,7 +857,6 @@ impl ListContentSelection { // optional bool wantChecksum = 4; - pub fn get_wantChecksum(&self) -> bool { self.wantChecksum.unwrap_or(false) } @@ -813,7 +875,6 @@ impl ListContentSelection { // optional bool wantContent = 5; - pub fn get_wantContent(&self) -> bool { self.wantContent.unwrap_or(false) } @@ -832,9 +893,10 @@ impl ListContentSelection { // optional .ContentRange contentRange = 6; - pub fn get_contentRange(&self) -> &ContentRange { - self.contentRange.as_ref().unwrap_or_else(|| ContentRange::default_instance()) + self.contentRange + .as_ref() + .unwrap_or_else(|| ContentRange::default_instance()) } pub fn clear_contentRange(&mut self) { self.contentRange.clear(); @@ -860,12 +922,13 @@ impl ListContentSelection { // Take field pub fn take_contentRange(&mut self) -> ContentRange { - self.contentRange.take().unwrap_or_else(|| ContentRange::new()) + self.contentRange + .take() + .unwrap_or_else(|| ContentRange::new()) } // optional bool wantDiff = 7; - pub fn get_wantDiff(&self) -> bool { self.wantDiff.unwrap_or(false) } @@ -884,7 +947,6 @@ impl ListContentSelection { // optional bytes baseRevision = 8; - pub fn get_baseRevision(&self) -> &[u8] { match self.baseRevision.as_ref() { Some(v) => &v, @@ -915,12 +977,13 @@ impl ListContentSelection { // Take field pub fn take_baseRevision(&mut self) -> ::std::vec::Vec { - self.baseRevision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.baseRevision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bytes hintRevision = 9; - pub fn get_hintRevision(&self) -> &[u8] { match self.hintRevision.as_ref() { Some(v) => &v, @@ -951,12 +1014,13 @@ impl ListContentSelection { // Take field pub fn take_hintRevision(&mut self) -> ::std::vec::Vec { - self.hintRevision.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.hintRevision + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bool wantNothingIfUpToDate = 10; - pub fn get_wantNothingIfUpToDate(&self) -> bool { self.wantNothingIfUpToDate.unwrap_or(false) } @@ -975,7 +1039,6 @@ impl ListContentSelection { // optional bool wantResolveAction = 12; - pub fn get_wantResolveAction(&self) -> bool { self.wantResolveAction.unwrap_or(false) } @@ -994,7 +1057,6 @@ impl ListContentSelection { // repeated .ClientIssue issues = 13; - pub fn get_issues(&self) -> &[super::playlist4issues::ClientIssue] { &self.issues } @@ -1003,23 +1065,29 @@ impl ListContentSelection { } // Param is passed by value, moved - pub fn set_issues(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_issues( + &mut self, + v: ::protobuf::RepeatedField, + ) { self.issues = v; } // Mutable pointer to the field. - pub fn mut_issues(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_issues( + &mut self, + ) -> &mut ::protobuf::RepeatedField { &mut self.issues } // Take field - pub fn take_issues(&mut self) -> ::protobuf::RepeatedField { + pub fn take_issues( + &mut self, + ) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.issues, ::protobuf::RepeatedField::new()) } // repeated .ClientResolveAction resolveAction = 14; - pub fn get_resolveAction(&self) -> &[super::playlist4issues::ClientResolveAction] { &self.resolveAction } @@ -1028,17 +1096,24 @@ impl ListContentSelection { } // Param is passed by value, moved - pub fn set_resolveAction(&mut self, v: ::protobuf::RepeatedField) { + pub fn set_resolveAction( + &mut self, + v: ::protobuf::RepeatedField, + ) { self.resolveAction = v; } // Mutable pointer to the field. - pub fn mut_resolveAction(&mut self) -> &mut ::protobuf::RepeatedField { + pub fn mut_resolveAction( + &mut self, + ) -> &mut ::protobuf::RepeatedField { &mut self.resolveAction } // Take field - pub fn take_resolveAction(&mut self) -> ::protobuf::RepeatedField { + pub fn take_resolveAction( + &mut self, + ) -> ::protobuf::RepeatedField { ::std::mem::replace(&mut self.resolveAction, ::protobuf::RepeatedField::new()) } } @@ -1049,98 +1124,138 @@ impl ::protobuf::Message for ListContentSelection { if !v.is_initialized() { return false; } - }; + } for v in &self.issues { if !v.is_initialized() { return false; } - }; + } for v in &self.resolveAction { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantRevision = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantLength = ::std::option::Option::Some(tmp); - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantAttributes = ::std::option::Option::Some(tmp); - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantChecksum = ::std::option::Option::Some(tmp); - }, + } 5 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantContent = ::std::option::Option::Some(tmp); - }, + } 6 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.contentRange)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.contentRange, + )?; + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantDiff = ::std::option::Option::Some(tmp); - }, + } 8 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.baseRevision)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.baseRevision, + )?; + } 9 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.hintRevision)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.hintRevision, + )?; + } 10 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantNothingIfUpToDate = ::std::option::Option::Some(tmp); - }, + } 12 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.wantResolveAction = ::std::option::Option::Some(tmp); - }, + } 13 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.issues)?; - }, + } 14 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.resolveAction)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.resolveAction, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1187,17 +1302,20 @@ impl ::protobuf::Message for ListContentSelection { for value in &self.issues { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } for value in &self.resolveAction { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.wantRevision { os.write_bool(1, v)?; } @@ -1237,12 +1355,12 @@ impl ::protobuf::Message for ListContentSelection { os.write_tag(13, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } for v in &self.resolveAction { os.write_tag(14, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1278,89 +1396,140 @@ impl ::protobuf::Message for ListContentSelection { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantRevision", - |m: &ListContentSelection| { &m.wantRevision }, - |m: &mut ListContentSelection| { &mut m.wantRevision }, + |m: &ListContentSelection| &m.wantRevision, + |m: &mut ListContentSelection| &mut m.wantRevision, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantLength", - |m: &ListContentSelection| { &m.wantLength }, - |m: &mut ListContentSelection| { &mut m.wantLength }, + |m: &ListContentSelection| &m.wantLength, + |m: &mut ListContentSelection| &mut m.wantLength, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantAttributes", - |m: &ListContentSelection| { &m.wantAttributes }, - |m: &mut ListContentSelection| { &mut m.wantAttributes }, + |m: &ListContentSelection| &m.wantAttributes, + |m: &mut ListContentSelection| &mut m.wantAttributes, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantChecksum", - |m: &ListContentSelection| { &m.wantChecksum }, - |m: &mut ListContentSelection| { &mut m.wantChecksum }, + |m: &ListContentSelection| &m.wantChecksum, + |m: &mut ListContentSelection| &mut m.wantChecksum, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantContent", - |m: &ListContentSelection| { &m.wantContent }, - |m: &mut ListContentSelection| { &mut m.wantContent }, + |m: &ListContentSelection| &m.wantContent, + |m: &mut ListContentSelection| &mut m.wantContent, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "contentRange", - |m: &ListContentSelection| { &m.contentRange }, - |m: &mut ListContentSelection| { &mut m.contentRange }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "contentRange", + |m: &ListContentSelection| &m.contentRange, + |m: &mut ListContentSelection| &mut m.contentRange, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantDiff", - |m: &ListContentSelection| { &m.wantDiff }, - |m: &mut ListContentSelection| { &mut m.wantDiff }, + |m: &ListContentSelection| &m.wantDiff, + |m: &mut ListContentSelection| &mut m.wantDiff, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "baseRevision", - |m: &ListContentSelection| { &m.baseRevision }, - |m: &mut ListContentSelection| { &mut m.baseRevision }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "hintRevision", - |m: &ListContentSelection| { &m.hintRevision }, - |m: &mut ListContentSelection| { &mut m.hintRevision }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "baseRevision", + |m: &ListContentSelection| &m.baseRevision, + |m: &mut ListContentSelection| &mut m.baseRevision, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "hintRevision", + |m: &ListContentSelection| &m.hintRevision, + |m: &mut ListContentSelection| &mut m.hintRevision, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantNothingIfUpToDate", - |m: &ListContentSelection| { &m.wantNothingIfUpToDate }, - |m: &mut ListContentSelection| { &mut m.wantNothingIfUpToDate }, + |m: &ListContentSelection| &m.wantNothingIfUpToDate, + |m: &mut ListContentSelection| &mut m.wantNothingIfUpToDate, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "wantResolveAction", - |m: &ListContentSelection| { &m.wantResolveAction }, - |m: &mut ListContentSelection| { &mut m.wantResolveAction }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "issues", - |m: &ListContentSelection| { &m.issues }, - |m: &mut ListContentSelection| { &mut m.issues }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "resolveAction", - |m: &ListContentSelection| { &m.resolveAction }, - |m: &mut ListContentSelection| { &mut m.resolveAction }, + |m: &ListContentSelection| &m.wantResolveAction, + |m: &mut ListContentSelection| &mut m.wantResolveAction, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "issues", + |m: &ListContentSelection| &m.issues, + |m: &mut ListContentSelection| &mut m.issues, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4issues::ClientResolveAction, + >, + >( + "resolveAction", + |m: &ListContentSelection| &m.resolveAction, + |m: &mut ListContentSelection| &mut m.resolveAction, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListContentSelection", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ListContentSelection { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListContentSelection::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ListContentSelection::new) } } } @@ -1415,16 +1584,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ ionB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/playlist4issues.rs b/protocol/src/playlist4issues.rs index 3448f5c5..c9091f26 100644 --- a/protocol/src/playlist4issues.rs +++ b/protocol/src/playlist4issues.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientIssue { // message fields level: ::std::option::Option, @@ -50,7 +50,6 @@ impl ClientIssue { // optional .ClientIssue.Level level = 1; - pub fn get_level(&self) -> ClientIssue_Level { self.level.unwrap_or(ClientIssue_Level::LEVEL_UNKNOWN) } @@ -69,7 +68,6 @@ impl ClientIssue { // optional .ClientIssue.Code code = 2; - pub fn get_code(&self) -> ClientIssue_Code { self.code.unwrap_or(ClientIssue_Code::CODE_UNKNOWN) } @@ -88,7 +86,6 @@ impl ClientIssue { // optional int32 repeatCount = 3; - pub fn get_repeatCount(&self) -> i32 { self.repeatCount.unwrap_or(0) } @@ -111,26 +108,44 @@ impl ::protobuf::Message for ClientIssue { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.level, 1, &mut self.unknown_fields)? - }, - 2 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.code, 2, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.level, + 1, + &mut self.unknown_fields, + )?, + 2 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.code, + 2, + &mut self.unknown_fields, + )?, 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.repeatCount = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -154,7 +169,10 @@ impl ::protobuf::Message for ClientIssue { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.level { os.write_enum(1, v.value())?; } @@ -199,29 +217,39 @@ impl ::protobuf::Message for ClientIssue { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "level", - |m: &ClientIssue| { &m.level }, - |m: &mut ClientIssue| { &mut m.level }, + |m: &ClientIssue| &m.level, + |m: &mut ClientIssue| &mut m.level, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "code", - |m: &ClientIssue| { &m.code }, - |m: &mut ClientIssue| { &mut m.code }, + |m: &ClientIssue| &m.code, + |m: &mut ClientIssue| &mut m.code, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "repeatCount", - |m: &ClientIssue| { &m.repeatCount }, - |m: &mut ClientIssue| { &mut m.repeatCount }, + |m: &ClientIssue| &m.repeatCount, + |m: &mut ClientIssue| &mut m.repeatCount, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientIssue", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -229,9 +257,7 @@ impl ::protobuf::Message for ClientIssue { fn default_instance() -> &'static ClientIssue { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientIssue::new) - } + unsafe { instance.get(ClientIssue::new) } } } @@ -256,7 +282,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientIssue { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ClientIssue_Level { LEVEL_UNKNOWN = 0, LEVEL_DEBUG = 1, @@ -279,7 +305,7 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Level { 3 => ::std::option::Option::Some(ClientIssue_Level::LEVEL_NOTICE), 4 => ::std::option::Option::Some(ClientIssue_Level::LEVEL_WARNING), 5 => ::std::option::Option::Some(ClientIssue_Level::LEVEL_ERROR), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -296,17 +322,20 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Level { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientIssue.Level", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ClientIssue.Level", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ClientIssue_Level { -} +impl ::std::marker::Copy for ClientIssue_Level {} impl ::std::default::Default for ClientIssue_Level { fn default() -> Self { @@ -320,7 +349,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientIssue_Level { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ClientIssue_Code { CODE_UNKNOWN = 0, CODE_INDEX_OUT_OF_BOUNDS = 1, @@ -343,7 +372,7 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Code { 3 => ::std::option::Option::Some(ClientIssue_Code::CODE_CACHED_CHANGE), 4 => ::std::option::Option::Some(ClientIssue_Code::CODE_OFFLINE_CHANGE), 5 => ::std::option::Option::Some(ClientIssue_Code::CODE_CONCURRENT_CHANGE), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -360,17 +389,20 @@ impl ::protobuf::ProtobufEnum for ClientIssue_Code { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientIssue.Code", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ClientIssue.Code", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ClientIssue_Code { -} +impl ::std::marker::Copy for ClientIssue_Code {} impl ::std::default::Default for ClientIssue_Code { fn default() -> Self { @@ -384,7 +416,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientIssue_Code { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ClientResolveAction { // message fields code: ::std::option::Option, @@ -407,7 +439,6 @@ impl ClientResolveAction { // optional .ClientResolveAction.Code code = 1; - pub fn get_code(&self) -> ClientResolveAction_Code { self.code.unwrap_or(ClientResolveAction_Code::CODE_UNKNOWN) } @@ -426,9 +457,9 @@ impl ClientResolveAction { // optional .ClientResolveAction.Initiator initiator = 2; - pub fn get_initiator(&self) -> ClientResolveAction_Initiator { - self.initiator.unwrap_or(ClientResolveAction_Initiator::INITIATOR_UNKNOWN) + self.initiator + .unwrap_or(ClientResolveAction_Initiator::INITIATOR_UNKNOWN) } pub fn clear_initiator(&mut self) { self.initiator = ::std::option::Option::None; @@ -449,19 +480,35 @@ impl ::protobuf::Message for ClientResolveAction { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.code, 1, &mut self.unknown_fields)? - }, - 2 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.initiator, 2, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.code, + 1, + &mut self.unknown_fields, + )?, + 2 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.initiator, + 2, + &mut self.unknown_fields, + )?, _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -482,7 +529,10 @@ impl ::protobuf::Message for ClientResolveAction { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.code { os.write_enum(1, v.value())?; } @@ -524,34 +574,40 @@ impl ::protobuf::Message for ClientResolveAction { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "code", - |m: &ClientResolveAction| { &m.code }, - |m: &mut ClientResolveAction| { &mut m.code }, + |m: &ClientResolveAction| &m.code, + |m: &mut ClientResolveAction| &mut m.code, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "initiator", - |m: &ClientResolveAction| { &m.initiator }, - |m: &mut ClientResolveAction| { &mut m.initiator }, + |m: &ClientResolveAction| &m.initiator, + |m: &mut ClientResolveAction| &mut m.initiator, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ClientResolveAction", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ClientResolveAction { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ClientResolveAction::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ClientResolveAction::new) } } } @@ -575,7 +631,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientResolveAction { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ClientResolveAction_Code { CODE_UNKNOWN = 0, CODE_NO_ACTION = 1, @@ -600,7 +656,7 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Code { 4 => ::std::option::Option::Some(ClientResolveAction_Code::CODE_DISCARD_LOCAL_CHANGES), 5 => ::std::option::Option::Some(ClientResolveAction_Code::CODE_SEND_DUMP), 6 => ::std::option::Option::Some(ClientResolveAction_Code::CODE_DISPLAY_ERROR_MESSAGE), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -618,17 +674,20 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Code { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientResolveAction.Code", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ClientResolveAction.Code", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ClientResolveAction_Code { -} +impl ::std::marker::Copy for ClientResolveAction_Code {} impl ::std::default::Default for ClientResolveAction_Code { fn default() -> Self { @@ -642,7 +701,7 @@ impl ::protobuf::reflect::ProtobufValue for ClientResolveAction_Code { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ClientResolveAction_Initiator { INITIATOR_UNKNOWN = 0, INITIATOR_SERVER = 1, @@ -659,7 +718,7 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Initiator { 0 => ::std::option::Option::Some(ClientResolveAction_Initiator::INITIATOR_UNKNOWN), 1 => ::std::option::Option::Some(ClientResolveAction_Initiator::INITIATOR_SERVER), 2 => ::std::option::Option::Some(ClientResolveAction_Initiator::INITIATOR_CLIENT), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -673,17 +732,20 @@ impl ::protobuf::ProtobufEnum for ClientResolveAction_Initiator { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ClientResolveAction.Initiator", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "ClientResolveAction.Initiator", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ClientResolveAction_Initiator { -} +impl ::std::marker::Copy for ClientResolveAction_Initiator {} impl ::std::default::Default for ClientResolveAction_Initiator { fn default() -> Self { @@ -719,16 +781,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x10\x01\x12\x14\n\x10INITIATOR_CLIENT\x10\x02\x1a\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/playlist4meta.rs b/protocol/src/playlist4meta.rs index f3a0b661..4364e33d 100644 --- a/protocol/src/playlist4meta.rs +++ b/protocol/src/playlist4meta.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListChecksum { // message fields version: ::std::option::Option, @@ -49,7 +49,6 @@ impl ListChecksum { // optional int32 version = 1; - pub fn get_version(&self) -> i32 { self.version.unwrap_or(0) } @@ -68,7 +67,6 @@ impl ListChecksum { // optional bytes sha1 = 4; - pub fn get_sha1(&self) -> &[u8] { match self.sha1.as_ref() { Some(v) => &v, @@ -108,23 +106,33 @@ impl ::protobuf::Message for ListChecksum { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.version = ::std::option::Option::Some(tmp); - }, + } 4 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.sha1)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -145,7 +153,10 @@ impl ::protobuf::Message for ListChecksum { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.version { os.write_int32(1, v)?; } @@ -187,24 +198,33 @@ impl ::protobuf::Message for ListChecksum { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "version", - |m: &ListChecksum| { &m.version }, - |m: &mut ListChecksum| { &mut m.version }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "sha1", - |m: &ListChecksum| { &m.sha1 }, - |m: &mut ListChecksum| { &mut m.sha1 }, + |m: &ListChecksum| &m.version, + |m: &mut ListChecksum| &mut m.version, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "sha1", + |m: &ListChecksum| &m.sha1, + |m: &mut ListChecksum| &mut m.sha1, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListChecksum", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -212,9 +232,7 @@ impl ::protobuf::Message for ListChecksum { fn default_instance() -> &'static ListChecksum { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListChecksum::new) - } + unsafe { instance.get(ListChecksum::new) } } } @@ -238,7 +256,7 @@ impl ::protobuf::reflect::ProtobufValue for ListChecksum { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct DownloadFormat { // message fields codec: ::std::option::Option, @@ -260,7 +278,6 @@ impl DownloadFormat { // optional .DownloadFormat.Codec codec = 1; - pub fn get_codec(&self) -> DownloadFormat_Codec { self.codec.unwrap_or(DownloadFormat_Codec::CODEC_UNKNOWN) } @@ -283,16 +300,28 @@ impl ::protobuf::Message for DownloadFormat { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.codec, 1, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.codec, + 1, + &mut self.unknown_fields, + )?, _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -310,7 +339,10 @@ impl ::protobuf::Message for DownloadFormat { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.codec { os.write_enum(1, v.value())?; } @@ -349,19 +381,23 @@ impl ::protobuf::Message for DownloadFormat { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "codec", - |m: &DownloadFormat| { &m.codec }, - |m: &mut DownloadFormat| { &mut m.codec }, + |m: &DownloadFormat| &m.codec, + |m: &mut DownloadFormat| &mut m.codec, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "DownloadFormat", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -369,9 +405,7 @@ impl ::protobuf::Message for DownloadFormat { fn default_instance() -> &'static DownloadFormat { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(DownloadFormat::new) - } + unsafe { instance.get(DownloadFormat::new) } } } @@ -394,7 +428,7 @@ impl ::protobuf::reflect::ProtobufValue for DownloadFormat { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum DownloadFormat_Codec { CODEC_UNKNOWN = 0, OGG_VORBIS = 1, @@ -413,7 +447,7 @@ impl ::protobuf::ProtobufEnum for DownloadFormat_Codec { 1 => ::std::option::Option::Some(DownloadFormat_Codec::OGG_VORBIS), 2 => ::std::option::Option::Some(DownloadFormat_Codec::FLAC), 3 => ::std::option::Option::Some(DownloadFormat_Codec::MPEG_1_LAYER_3), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -428,17 +462,20 @@ impl ::protobuf::ProtobufEnum for DownloadFormat_Codec { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("DownloadFormat.Codec", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "DownloadFormat.Codec", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for DownloadFormat_Codec { -} +impl ::std::marker::Copy for DownloadFormat_Codec {} impl ::std::default::Default for DownloadFormat_Codec { fn default() -> Self { @@ -452,7 +489,7 @@ impl ::protobuf::reflect::ProtobufValue for DownloadFormat_Codec { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListAttributes { // message fields name: ::protobuf::SingularField<::std::string::String>, @@ -483,7 +520,6 @@ impl ListAttributes { // optional string name = 1; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -514,12 +550,13 @@ impl ListAttributes { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string description = 2; - pub fn get_description(&self) -> &str { match self.description.as_ref() { Some(v) => &v, @@ -550,12 +587,13 @@ impl ListAttributes { // Take field pub fn take_description(&mut self) -> ::std::string::String { - self.description.take().unwrap_or_else(|| ::std::string::String::new()) + self.description + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bytes picture = 3; - pub fn get_picture(&self) -> &[u8] { match self.picture.as_ref() { Some(v) => &v, @@ -586,12 +624,13 @@ impl ListAttributes { // Take field pub fn take_picture(&mut self) -> ::std::vec::Vec { - self.picture.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.picture + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bool collaborative = 4; - pub fn get_collaborative(&self) -> bool { self.collaborative.unwrap_or(false) } @@ -610,7 +649,6 @@ impl ListAttributes { // optional string pl3_version = 5; - pub fn get_pl3_version(&self) -> &str { match self.pl3_version.as_ref() { Some(v) => &v, @@ -641,12 +679,13 @@ impl ListAttributes { // Take field pub fn take_pl3_version(&mut self) -> ::std::string::String { - self.pl3_version.take().unwrap_or_else(|| ::std::string::String::new()) + self.pl3_version + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool deleted_by_owner = 6; - pub fn get_deleted_by_owner(&self) -> bool { self.deleted_by_owner.unwrap_or(false) } @@ -665,7 +704,6 @@ impl ListAttributes { // optional bool restricted_collaborative = 7; - pub fn get_restricted_collaborative(&self) -> bool { self.restricted_collaborative.unwrap_or(false) } @@ -684,7 +722,6 @@ impl ListAttributes { // optional int64 deprecated_client_id = 8; - pub fn get_deprecated_client_id(&self) -> i64 { self.deprecated_client_id.unwrap_or(0) } @@ -703,7 +740,6 @@ impl ListAttributes { // optional bool public_starred = 9; - pub fn get_public_starred(&self) -> bool { self.public_starred.unwrap_or(false) } @@ -722,7 +758,6 @@ impl ListAttributes { // optional string client_id = 10; - pub fn get_client_id(&self) -> &str { match self.client_id.as_ref() { Some(v) => &v, @@ -753,7 +788,9 @@ impl ListAttributes { // Take field pub fn take_client_id(&mut self) -> ::std::string::String { - self.client_id.take().unwrap_or_else(|| ::std::string::String::new()) + self.client_id + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -762,63 +799,89 @@ impl ::protobuf::Message for ListAttributes { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 2 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.description)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.description, + )?; + } 3 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.picture)?; - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.collaborative = ::std::option::Option::Some(tmp); - }, + } 5 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.pl3_version)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.pl3_version, + )?; + } 6 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.deleted_by_owner = ::std::option::Option::Some(tmp); - }, + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.restricted_collaborative = ::std::option::Option::Some(tmp); - }, + } 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.deprecated_client_id = ::std::option::Option::Some(tmp); - }, + } 9 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.public_starred = ::std::option::Option::Some(tmp); - }, + } 10 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.client_id)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -863,7 +926,10 @@ impl ::protobuf::Message for ListAttributes { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.name.as_ref() { os.write_string(1, &v)?; } @@ -929,64 +995,105 @@ impl ::protobuf::Message for ListAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &ListAttributes| { &m.name }, - |m: &mut ListAttributes| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "description", - |m: &ListAttributes| { &m.description }, - |m: &mut ListAttributes| { &mut m.description }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "picture", - |m: &ListAttributes| { &m.picture }, - |m: &mut ListAttributes| { &mut m.picture }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "name", + |m: &ListAttributes| &m.name, + |m: &mut ListAttributes| &mut m.name, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "description", + |m: &ListAttributes| &m.description, + |m: &mut ListAttributes| &mut m.description, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "picture", + |m: &ListAttributes| &m.picture, + |m: &mut ListAttributes| &mut m.picture, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "collaborative", - |m: &ListAttributes| { &m.collaborative }, - |m: &mut ListAttributes| { &mut m.collaborative }, + |m: &ListAttributes| &m.collaborative, + |m: &mut ListAttributes| &mut m.collaborative, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "pl3_version", - |m: &ListAttributes| { &m.pl3_version }, - |m: &mut ListAttributes| { &mut m.pl3_version }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "pl3_version", + |m: &ListAttributes| &m.pl3_version, + |m: &mut ListAttributes| &mut m.pl3_version, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "deleted_by_owner", - |m: &ListAttributes| { &m.deleted_by_owner }, - |m: &mut ListAttributes| { &mut m.deleted_by_owner }, + |m: &ListAttributes| &m.deleted_by_owner, + |m: &mut ListAttributes| &mut m.deleted_by_owner, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "restricted_collaborative", - |m: &ListAttributes| { &m.restricted_collaborative }, - |m: &mut ListAttributes| { &mut m.restricted_collaborative }, + |m: &ListAttributes| &m.restricted_collaborative, + |m: &mut ListAttributes| &mut m.restricted_collaborative, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "deprecated_client_id", - |m: &ListAttributes| { &m.deprecated_client_id }, - |m: &mut ListAttributes| { &mut m.deprecated_client_id }, + |m: &ListAttributes| &m.deprecated_client_id, + |m: &mut ListAttributes| &mut m.deprecated_client_id, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "public_starred", - |m: &ListAttributes| { &m.public_starred }, - |m: &mut ListAttributes| { &mut m.public_starred }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "client_id", - |m: &ListAttributes| { &m.client_id }, - |m: &mut ListAttributes| { &mut m.client_id }, + |m: &ListAttributes| &m.public_starred, + |m: &mut ListAttributes| &mut m.public_starred, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "client_id", + |m: &ListAttributes| &m.client_id, + |m: &mut ListAttributes| &mut m.client_id, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListAttributes", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -994,9 +1101,7 @@ impl ::protobuf::Message for ListAttributes { fn default_instance() -> &'static ListAttributes { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListAttributes::new) - } + unsafe { instance.get(ListAttributes::new) } } } @@ -1028,7 +1133,7 @@ impl ::protobuf::reflect::ProtobufValue for ListAttributes { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ItemAttributes { // message fields added_by: ::protobuf::SingularField<::std::string::String>, @@ -1059,7 +1164,6 @@ impl ItemAttributes { // optional string added_by = 1; - pub fn get_added_by(&self) -> &str { match self.added_by.as_ref() { Some(v) => &v, @@ -1090,12 +1194,13 @@ impl ItemAttributes { // Take field pub fn take_added_by(&mut self) -> ::std::string::String { - self.added_by.take().unwrap_or_else(|| ::std::string::String::new()) + self.added_by + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional int64 timestamp = 2; - pub fn get_timestamp(&self) -> i64 { self.timestamp.unwrap_or(0) } @@ -1114,7 +1219,6 @@ impl ItemAttributes { // optional string message = 3; - pub fn get_message(&self) -> &str { match self.message.as_ref() { Some(v) => &v, @@ -1145,12 +1249,13 @@ impl ItemAttributes { // Take field pub fn take_message(&mut self) -> ::std::string::String { - self.message.take().unwrap_or_else(|| ::std::string::String::new()) + self.message + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool seen = 4; - pub fn get_seen(&self) -> bool { self.seen.unwrap_or(false) } @@ -1169,7 +1274,6 @@ impl ItemAttributes { // optional int64 download_count = 5; - pub fn get_download_count(&self) -> i64 { self.download_count.unwrap_or(0) } @@ -1188,9 +1292,10 @@ impl ItemAttributes { // optional .DownloadFormat download_format = 6; - pub fn get_download_format(&self) -> &DownloadFormat { - self.download_format.as_ref().unwrap_or_else(|| DownloadFormat::default_instance()) + self.download_format + .as_ref() + .unwrap_or_else(|| DownloadFormat::default_instance()) } pub fn clear_download_format(&mut self) { self.download_format.clear(); @@ -1216,12 +1321,13 @@ impl ItemAttributes { // Take field pub fn take_download_format(&mut self) -> DownloadFormat { - self.download_format.take().unwrap_or_else(|| DownloadFormat::new()) + self.download_format + .take() + .unwrap_or_else(|| DownloadFormat::new()) } // optional string sevendigital_id = 7; - pub fn get_sevendigital_id(&self) -> &str { match self.sevendigital_id.as_ref() { Some(v) => &v, @@ -1252,12 +1358,13 @@ impl ItemAttributes { // Take field pub fn take_sevendigital_id(&mut self) -> ::std::string::String { - self.sevendigital_id.take().unwrap_or_else(|| ::std::string::String::new()) + self.sevendigital_id + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional int64 sevendigital_left = 8; - pub fn get_sevendigital_left(&self) -> i64 { self.sevendigital_left.unwrap_or(0) } @@ -1276,7 +1383,6 @@ impl ItemAttributes { // optional int64 seen_at = 9; - pub fn get_seen_at(&self) -> i64 { self.seen_at.unwrap_or(0) } @@ -1295,7 +1401,6 @@ impl ItemAttributes { // optional bool public = 10; - pub fn get_public(&self) -> bool { self.public.unwrap_or(false) } @@ -1319,71 +1424,99 @@ impl ::protobuf::Message for ItemAttributes { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.added_by)?; - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.timestamp = ::std::option::Option::Some(tmp); - }, + } 3 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.message)?; - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.seen = ::std::option::Option::Some(tmp); - }, + } 5 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.download_count = ::std::option::Option::Some(tmp); - }, + } 6 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.download_format)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.download_format, + )?; + } 7 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.sevendigital_id)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.sevendigital_id, + )?; + } 8 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.sevendigital_left = ::std::option::Option::Some(tmp); - }, + } 9 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.seen_at = ::std::option::Option::Some(tmp); - }, + } 10 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.public = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1429,7 +1562,10 @@ impl ::protobuf::Message for ItemAttributes { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.added_by.as_ref() { os.write_string(1, &v)?; } @@ -1497,64 +1633,103 @@ impl ::protobuf::Message for ItemAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "added_by", - |m: &ItemAttributes| { &m.added_by }, - |m: &mut ItemAttributes| { &mut m.added_by }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "added_by", + |m: &ItemAttributes| &m.added_by, + |m: &mut ItemAttributes| &mut m.added_by, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "timestamp", - |m: &ItemAttributes| { &m.timestamp }, - |m: &mut ItemAttributes| { &mut m.timestamp }, + |m: &ItemAttributes| &m.timestamp, + |m: &mut ItemAttributes| &mut m.timestamp, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "message", - |m: &ItemAttributes| { &m.message }, - |m: &mut ItemAttributes| { &mut m.message }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "message", + |m: &ItemAttributes| &m.message, + |m: &mut ItemAttributes| &mut m.message, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "seen", - |m: &ItemAttributes| { &m.seen }, - |m: &mut ItemAttributes| { &mut m.seen }, + |m: &ItemAttributes| &m.seen, + |m: &mut ItemAttributes| &mut m.seen, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "download_count", - |m: &ItemAttributes| { &m.download_count }, - |m: &mut ItemAttributes| { &mut m.download_count }, + |m: &ItemAttributes| &m.download_count, + |m: &mut ItemAttributes| &mut m.download_count, )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "download_format", - |m: &ItemAttributes| { &m.download_format }, - |m: &mut ItemAttributes| { &mut m.download_format }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "sevendigital_id", - |m: &ItemAttributes| { &m.sevendigital_id }, - |m: &mut ItemAttributes| { &mut m.sevendigital_id }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "download_format", + |m: &ItemAttributes| &m.download_format, + |m: &mut ItemAttributes| &mut m.download_format, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "sevendigital_id", + |m: &ItemAttributes| &m.sevendigital_id, + |m: &mut ItemAttributes| &mut m.sevendigital_id, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "sevendigital_left", - |m: &ItemAttributes| { &m.sevendigital_left }, - |m: &mut ItemAttributes| { &mut m.sevendigital_left }, + |m: &ItemAttributes| &m.sevendigital_left, + |m: &mut ItemAttributes| &mut m.sevendigital_left, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "seen_at", - |m: &ItemAttributes| { &m.seen_at }, - |m: &mut ItemAttributes| { &mut m.seen_at }, + |m: &ItemAttributes| &m.seen_at, + |m: &mut ItemAttributes| &mut m.seen_at, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "public", - |m: &ItemAttributes| { &m.public }, - |m: &mut ItemAttributes| { &mut m.public }, + |m: &ItemAttributes| &m.public, + |m: &mut ItemAttributes| &mut m.public, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ItemAttributes", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1562,9 +1737,7 @@ impl ::protobuf::Message for ItemAttributes { fn default_instance() -> &'static ItemAttributes { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ItemAttributes::new) - } + unsafe { instance.get(ItemAttributes::new) } } } @@ -1596,7 +1769,7 @@ impl ::protobuf::reflect::ProtobufValue for ItemAttributes { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct StringAttribute { // message fields key: ::protobuf::SingularField<::std::string::String>, @@ -1619,7 +1792,6 @@ impl StringAttribute { // optional string key = 1; - pub fn get_key(&self) -> &str { match self.key.as_ref() { Some(v) => &v, @@ -1650,12 +1822,13 @@ impl StringAttribute { // Take field pub fn take_key(&mut self) -> ::std::string::String { - self.key.take().unwrap_or_else(|| ::std::string::String::new()) + self.key + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string value = 2; - pub fn get_value(&self) -> &str { match self.value.as_ref() { Some(v) => &v, @@ -1686,7 +1859,9 @@ impl StringAttribute { // Take field pub fn take_value(&mut self) -> ::std::string::String { - self.value.take().unwrap_or_else(|| ::std::string::String::new()) + self.value + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -1695,19 +1870,27 @@ impl ::protobuf::Message for StringAttribute { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.key)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.value)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1728,7 +1911,10 @@ impl ::protobuf::Message for StringAttribute { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.key.as_ref() { os.write_string(1, &v)?; } @@ -1770,24 +1956,35 @@ impl ::protobuf::Message for StringAttribute { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "key", - |m: &StringAttribute| { &m.key }, - |m: &mut StringAttribute| { &mut m.key }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "value", - |m: &StringAttribute| { &m.value }, - |m: &mut StringAttribute| { &mut m.value }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "key", + |m: &StringAttribute| &m.key, + |m: &mut StringAttribute| &mut m.key, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "value", + |m: &StringAttribute| &m.value, + |m: &mut StringAttribute| &mut m.value, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "StringAttribute", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1795,9 +1992,7 @@ impl ::protobuf::Message for StringAttribute { fn default_instance() -> &'static StringAttribute { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(StringAttribute::new) - } + unsafe { instance.get(StringAttribute::new) } } } @@ -1821,7 +2016,7 @@ impl ::protobuf::reflect::ProtobufValue for StringAttribute { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct StringAttributes { // message fields attribute: ::protobuf::RepeatedField, @@ -1843,7 +2038,6 @@ impl StringAttributes { // repeated .StringAttribute attribute = 1; - pub fn get_attribute(&self) -> &[StringAttribute] { &self.attribute } @@ -1873,20 +2067,28 @@ impl ::protobuf::Message for StringAttributes { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.attribute)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1899,18 +2101,21 @@ impl ::protobuf::Message for StringAttributes { for value in &self.attribute { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.attribute { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1946,29 +2151,34 @@ impl ::protobuf::Message for StringAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "attribute", - |m: &StringAttributes| { &m.attribute }, - |m: &mut StringAttributes| { &mut m.attribute }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "attribute", + |m: &StringAttributes| &m.attribute, + |m: &mut StringAttributes| &mut m.attribute, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "StringAttributes", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static StringAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(StringAttributes::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(StringAttributes::new) } } } @@ -2017,16 +2227,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ tribute\x18\x01\x20\x03(\x0b2\x10.StringAttributeB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/playlist4ops.rs b/protocol/src/playlist4ops.rs index b16fe5d3..b72f2bde 100644 --- a/protocol/src/playlist4ops.rs +++ b/protocol/src/playlist4ops.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Add { // message fields fromIndex: ::std::option::Option, @@ -52,7 +52,6 @@ impl Add { // optional int32 fromIndex = 1; - pub fn get_fromIndex(&self) -> i32 { self.fromIndex.unwrap_or(0) } @@ -71,7 +70,6 @@ impl Add { // repeated .Item items = 2; - pub fn get_items(&self) -> &[super::playlist4content::Item] { &self.items } @@ -96,9 +94,10 @@ impl Add { // optional .ListChecksum list_checksum = 3; - pub fn get_list_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.list_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.list_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_list_checksum(&mut self) { self.list_checksum.clear(); @@ -124,12 +123,13 @@ impl Add { // Take field pub fn take_list_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.list_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.list_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional bool addLast = 4; - pub fn get_addLast(&self) -> bool { self.addLast.unwrap_or(false) } @@ -148,7 +148,6 @@ impl Add { // optional bool addFirst = 5; - pub fn get_addFirst(&self) -> bool { self.addFirst.unwrap_or(false) } @@ -172,49 +171,67 @@ impl ::protobuf::Message for Add { if !v.is_initialized() { return false; } - }; + } for v in &self.list_checksum { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.fromIndex = ::std::option::Option::Some(tmp); - }, + } 2 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.items)?; - }, + } 3 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.list_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.list_checksum, + )?; + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.addLast = ::std::option::Option::Some(tmp); - }, + } 5 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.addFirst = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -230,7 +247,7 @@ impl ::protobuf::Message for Add { for value in &self.items { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.list_checksum.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -246,7 +263,10 @@ impl ::protobuf::Message for Add { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.fromIndex { os.write_int32(1, v)?; } @@ -254,7 +274,7 @@ impl ::protobuf::Message for Add { os.write_tag(2, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.list_checksum.as_ref() { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -301,39 +321,55 @@ impl ::protobuf::Message for Add { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "fromIndex", - |m: &Add| { &m.fromIndex }, - |m: &mut Add| { &mut m.fromIndex }, + |m: &Add| &m.fromIndex, + |m: &mut Add| &mut m.fromIndex, )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "items", - |m: &Add| { &m.items }, - |m: &mut Add| { &mut m.items }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "list_checksum", - |m: &Add| { &m.list_checksum }, - |m: &mut Add| { &mut m.list_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("items", |m: &Add| &m.items, |m: &mut Add| &mut m.items), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "list_checksum", + |m: &Add| &m.list_checksum, + |m: &mut Add| &mut m.list_checksum, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "addLast", - |m: &Add| { &m.addLast }, - |m: &mut Add| { &mut m.addLast }, + |m: &Add| &m.addLast, + |m: &mut Add| &mut m.addLast, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "addFirst", - |m: &Add| { &m.addFirst }, - |m: &mut Add| { &mut m.addFirst }, + |m: &Add| &m.addFirst, + |m: &mut Add| &mut m.addFirst, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Add", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -341,9 +377,7 @@ impl ::protobuf::Message for Add { fn default_instance() -> &'static Add { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Add::new) - } + unsafe { instance.get(Add::new) } } } @@ -370,7 +404,7 @@ impl ::protobuf::reflect::ProtobufValue for Add { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Rem { // message fields fromIndex: ::std::option::Option, @@ -398,7 +432,6 @@ impl Rem { // optional int32 fromIndex = 1; - pub fn get_fromIndex(&self) -> i32 { self.fromIndex.unwrap_or(0) } @@ -417,7 +450,6 @@ impl Rem { // optional int32 length = 2; - pub fn get_length(&self) -> i32 { self.length.unwrap_or(0) } @@ -436,7 +468,6 @@ impl Rem { // repeated .Item items = 3; - pub fn get_items(&self) -> &[super::playlist4content::Item] { &self.items } @@ -461,9 +492,10 @@ impl Rem { // optional .ListChecksum list_checksum = 4; - pub fn get_list_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.list_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.list_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_list_checksum(&mut self) { self.list_checksum.clear(); @@ -489,14 +521,17 @@ impl Rem { // Take field pub fn take_list_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.list_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.list_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListChecksum items_checksum = 5; - pub fn get_items_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.items_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.items_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_items_checksum(&mut self) { self.items_checksum.clear(); @@ -522,14 +557,17 @@ impl Rem { // Take field pub fn take_items_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.items_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.items_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListChecksum uris_checksum = 6; - pub fn get_uris_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.uris_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.uris_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_uris_checksum(&mut self) { self.uris_checksum.clear(); @@ -555,12 +593,13 @@ impl Rem { // Take field pub fn take_uris_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.uris_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.uris_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional bool itemsAsKey = 7; - pub fn get_itemsAsKey(&self) -> bool { self.itemsAsKey.unwrap_or(false) } @@ -584,65 +623,91 @@ impl ::protobuf::Message for Rem { if !v.is_initialized() { return false; } - }; + } for v in &self.list_checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.items_checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.uris_checksum { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.fromIndex = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.length = ::std::option::Option::Some(tmp); - }, + } 3 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.items)?; - }, + } 4 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.list_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.list_checksum, + )?; + } 5 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.items_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.items_checksum, + )?; + } 6 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.uris_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.uris_checksum, + )?; + } 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.itemsAsKey = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -661,7 +726,7 @@ impl ::protobuf::Message for Rem { for value in &self.items { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.list_checksum.as_ref() { let len = v.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -682,7 +747,10 @@ impl ::protobuf::Message for Rem { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.fromIndex { os.write_int32(1, v)?; } @@ -693,7 +761,7 @@ impl ::protobuf::Message for Rem { os.write_tag(3, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.list_checksum.as_ref() { os.write_tag(4, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -747,49 +815,73 @@ impl ::protobuf::Message for Rem { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "fromIndex", - |m: &Rem| { &m.fromIndex }, - |m: &mut Rem| { &mut m.fromIndex }, + |m: &Rem| &m.fromIndex, + |m: &mut Rem| &mut m.fromIndex, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( - "length", - |m: &Rem| { &m.length }, - |m: &mut Rem| { &mut m.length }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( + "length", |m: &Rem| &m.length, |m: &mut Rem| &mut m.length )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "items", - |m: &Rem| { &m.items }, - |m: &mut Rem| { &mut m.items }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "list_checksum", - |m: &Rem| { &m.list_checksum }, - |m: &mut Rem| { &mut m.list_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "items_checksum", - |m: &Rem| { &m.items_checksum }, - |m: &mut Rem| { &mut m.items_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "uris_checksum", - |m: &Rem| { &m.uris_checksum }, - |m: &mut Rem| { &mut m.uris_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("items", |m: &Rem| &m.items, |m: &mut Rem| &mut m.items), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "list_checksum", + |m: &Rem| &m.list_checksum, + |m: &mut Rem| &mut m.list_checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "items_checksum", + |m: &Rem| &m.items_checksum, + |m: &mut Rem| &mut m.items_checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "uris_checksum", + |m: &Rem| &m.uris_checksum, + |m: &mut Rem| &mut m.uris_checksum, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "itemsAsKey", - |m: &Rem| { &m.itemsAsKey }, - |m: &mut Rem| { &mut m.itemsAsKey }, + |m: &Rem| &m.itemsAsKey, + |m: &mut Rem| &mut m.itemsAsKey, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Rem", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -797,9 +889,7 @@ impl ::protobuf::Message for Rem { fn default_instance() -> &'static Rem { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Rem::new) - } + unsafe { instance.get(Rem::new) } } } @@ -828,7 +918,7 @@ impl ::protobuf::reflect::ProtobufValue for Rem { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Mov { // message fields fromIndex: ::std::option::Option, @@ -855,7 +945,6 @@ impl Mov { // optional int32 fromIndex = 1; - pub fn get_fromIndex(&self) -> i32 { self.fromIndex.unwrap_or(0) } @@ -874,7 +963,6 @@ impl Mov { // optional int32 length = 2; - pub fn get_length(&self) -> i32 { self.length.unwrap_or(0) } @@ -893,7 +981,6 @@ impl Mov { // optional int32 toIndex = 3; - pub fn get_toIndex(&self) -> i32 { self.toIndex.unwrap_or(0) } @@ -912,9 +999,10 @@ impl Mov { // optional .ListChecksum list_checksum = 4; - pub fn get_list_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.list_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.list_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_list_checksum(&mut self) { self.list_checksum.clear(); @@ -940,14 +1028,17 @@ impl Mov { // Take field pub fn take_list_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.list_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.list_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListChecksum items_checksum = 5; - pub fn get_items_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.items_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.items_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_items_checksum(&mut self) { self.items_checksum.clear(); @@ -973,14 +1064,17 @@ impl Mov { // Take field pub fn take_items_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.items_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.items_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListChecksum uris_checksum = 6; - pub fn get_uris_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.uris_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.uris_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_uris_checksum(&mut self) { self.uris_checksum.clear(); @@ -1006,7 +1100,9 @@ impl Mov { // Take field pub fn take_uris_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.uris_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.uris_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } } @@ -1016,57 +1112,83 @@ impl ::protobuf::Message for Mov { if !v.is_initialized() { return false; } - }; + } for v in &self.items_checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.uris_checksum { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.fromIndex = ::std::option::Option::Some(tmp); - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.length = ::std::option::Option::Some(tmp); - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.toIndex = ::std::option::Option::Some(tmp); - }, + } 4 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.list_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.list_checksum, + )?; + } 5 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.items_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.items_checksum, + )?; + } 6 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.uris_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.uris_checksum, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1102,7 +1224,10 @@ impl ::protobuf::Message for Mov { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.fromIndex { os.write_int32(1, v)?; } @@ -1162,44 +1287,67 @@ impl ::protobuf::Message for Mov { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "fromIndex", - |m: &Mov| { &m.fromIndex }, - |m: &mut Mov| { &mut m.fromIndex }, + |m: &Mov| &m.fromIndex, + |m: &mut Mov| &mut m.fromIndex, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( - "length", - |m: &Mov| { &m.length }, - |m: &mut Mov| { &mut m.length }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( + "length", |m: &Mov| &m.length, |m: &mut Mov| &mut m.length )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "toIndex", - |m: &Mov| { &m.toIndex }, - |m: &mut Mov| { &mut m.toIndex }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "list_checksum", - |m: &Mov| { &m.list_checksum }, - |m: &mut Mov| { &mut m.list_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "items_checksum", - |m: &Mov| { &m.items_checksum }, - |m: &mut Mov| { &mut m.items_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "uris_checksum", - |m: &Mov| { &m.uris_checksum }, - |m: &mut Mov| { &mut m.uris_checksum }, + |m: &Mov| &m.toIndex, + |m: &mut Mov| &mut m.toIndex, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "list_checksum", + |m: &Mov| &m.list_checksum, + |m: &mut Mov| &mut m.list_checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "items_checksum", + |m: &Mov| &m.items_checksum, + |m: &mut Mov| &mut m.items_checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "uris_checksum", + |m: &Mov| &m.uris_checksum, + |m: &mut Mov| &mut m.uris_checksum, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Mov", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1207,9 +1355,7 @@ impl ::protobuf::Message for Mov { fn default_instance() -> &'static Mov { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Mov::new) - } + unsafe { instance.get(Mov::new) } } } @@ -1237,7 +1383,7 @@ impl ::protobuf::reflect::ProtobufValue for Mov { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ItemAttributesPartialState { // message fields values: ::protobuf::SingularPtrField, @@ -1260,9 +1406,10 @@ impl ItemAttributesPartialState { // optional .ItemAttributes values = 1; - pub fn get_values(&self) -> &super::playlist4meta::ItemAttributes { - self.values.as_ref().unwrap_or_else(|| super::playlist4meta::ItemAttributes::default_instance()) + self.values + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ItemAttributes::default_instance()) } pub fn clear_values(&mut self) { self.values.clear(); @@ -1288,12 +1435,13 @@ impl ItemAttributesPartialState { // Take field pub fn take_values(&mut self) -> super::playlist4meta::ItemAttributes { - self.values.take().unwrap_or_else(|| super::playlist4meta::ItemAttributes::new()) + self.values + .take() + .unwrap_or_else(|| super::playlist4meta::ItemAttributes::new()) } // repeated .ItemAttributesPartialState.ItemAttributeKind no_value = 2; - pub fn get_no_value(&self) -> &[ItemAttributesPartialState_ItemAttributeKind] { &self.no_value } @@ -1302,17 +1450,24 @@ impl ItemAttributesPartialState { } // Param is passed by value, moved - pub fn set_no_value(&mut self, v: ::std::vec::Vec) { + pub fn set_no_value( + &mut self, + v: ::std::vec::Vec, + ) { self.no_value = v; } // Mutable pointer to the field. - pub fn mut_no_value(&mut self) -> &mut ::std::vec::Vec { + pub fn mut_no_value( + &mut self, + ) -> &mut ::std::vec::Vec { &mut self.no_value } // Take field - pub fn take_no_value(&mut self) -> ::std::vec::Vec { + pub fn take_no_value( + &mut self, + ) -> ::std::vec::Vec { ::std::mem::replace(&mut self.no_value, ::std::vec::Vec::new()) } } @@ -1323,23 +1478,35 @@ impl ::protobuf::Message for ItemAttributesPartialState { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.values)?; - }, - 2 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.no_value, 2, &mut self.unknown_fields)? - }, + } + 2 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.no_value, + 2, + &mut self.unknown_fields, + )?, _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1355,13 +1522,16 @@ impl ::protobuf::Message for ItemAttributesPartialState { } for value in &self.no_value { my_size += ::protobuf::rt::enum_size(2, *value); - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.values.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -1369,7 +1539,7 @@ impl ::protobuf::Message for ItemAttributesPartialState { } for v in &self.no_value { os.write_enum(2, v.value())?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1405,34 +1575,46 @@ impl ::protobuf::Message for ItemAttributesPartialState { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "values", - |m: &ItemAttributesPartialState| { &m.values }, - |m: &mut ItemAttributesPartialState| { &mut m.values }, - )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4meta::ItemAttributes, + >, + >( + "values", + |m: &ItemAttributesPartialState| &m.values, + |m: &mut ItemAttributesPartialState| &mut m.values, + ), + ); + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum< + ItemAttributesPartialState_ItemAttributeKind, + >, + >( "no_value", - |m: &ItemAttributesPartialState| { &m.no_value }, - |m: &mut ItemAttributesPartialState| { &mut m.no_value }, + |m: &ItemAttributesPartialState| &m.no_value, + |m: &mut ItemAttributesPartialState| &mut m.no_value, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ItemAttributesPartialState", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ItemAttributesPartialState { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ItemAttributesPartialState::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ItemAttributesPartialState::new) } } } @@ -1456,7 +1638,7 @@ impl ::protobuf::reflect::ProtobufValue for ItemAttributesPartialState { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ItemAttributesPartialState_ItemAttributeKind { ITEM_UNKNOWN = 0, ITEM_ADDED_BY = 1, @@ -1478,18 +1660,40 @@ impl ::protobuf::ProtobufEnum for ItemAttributesPartialState_ItemAttributeKind { fn from_i32(value: i32) -> ::std::option::Option { match value { - 0 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_UNKNOWN), - 1 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_ADDED_BY), - 2 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_TIMESTAMP), - 3 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_MESSAGE), - 4 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_SEEN), - 5 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_DOWNLOAD_COUNT), - 6 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_DOWNLOAD_FORMAT), - 7 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_SEVENDIGITAL_ID), - 8 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_SEVENDIGITAL_LEFT), - 9 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_SEEN_AT), - 10 => ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_PUBLIC), - _ => ::std::option::Option::None + 0 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_UNKNOWN, + ), + 1 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_ADDED_BY, + ), + 2 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_TIMESTAMP, + ), + 3 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_MESSAGE, + ), + 4 => { + ::std::option::Option::Some(ItemAttributesPartialState_ItemAttributeKind::ITEM_SEEN) + } + 5 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_DOWNLOAD_COUNT, + ), + 6 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_DOWNLOAD_FORMAT, + ), + 7 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_SEVENDIGITAL_ID, + ), + 8 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_SEVENDIGITAL_LEFT, + ), + 9 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_SEEN_AT, + ), + 10 => ::std::option::Option::Some( + ItemAttributesPartialState_ItemAttributeKind::ITEM_PUBLIC, + ), + _ => ::std::option::Option::None, } } @@ -1511,17 +1715,22 @@ impl ::protobuf::ProtobufEnum for ItemAttributesPartialState_ItemAttributeKind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ItemAttributesPartialState.ItemAttributeKind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::< + ItemAttributesPartialState_ItemAttributeKind, + >( + "ItemAttributesPartialState.ItemAttributeKind", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ItemAttributesPartialState_ItemAttributeKind { -} +impl ::std::marker::Copy for ItemAttributesPartialState_ItemAttributeKind {} impl ::std::default::Default for ItemAttributesPartialState_ItemAttributeKind { fn default() -> Self { @@ -1535,7 +1744,7 @@ impl ::protobuf::reflect::ProtobufValue for ItemAttributesPartialState_ItemAttri } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct ListAttributesPartialState { // message fields values: ::protobuf::SingularPtrField, @@ -1558,9 +1767,10 @@ impl ListAttributesPartialState { // optional .ListAttributes values = 1; - pub fn get_values(&self) -> &super::playlist4meta::ListAttributes { - self.values.as_ref().unwrap_or_else(|| super::playlist4meta::ListAttributes::default_instance()) + self.values + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListAttributes::default_instance()) } pub fn clear_values(&mut self) { self.values.clear(); @@ -1586,12 +1796,13 @@ impl ListAttributesPartialState { // Take field pub fn take_values(&mut self) -> super::playlist4meta::ListAttributes { - self.values.take().unwrap_or_else(|| super::playlist4meta::ListAttributes::new()) + self.values + .take() + .unwrap_or_else(|| super::playlist4meta::ListAttributes::new()) } // repeated .ListAttributesPartialState.ListAttributeKind no_value = 2; - pub fn get_no_value(&self) -> &[ListAttributesPartialState_ListAttributeKind] { &self.no_value } @@ -1600,17 +1811,24 @@ impl ListAttributesPartialState { } // Param is passed by value, moved - pub fn set_no_value(&mut self, v: ::std::vec::Vec) { + pub fn set_no_value( + &mut self, + v: ::std::vec::Vec, + ) { self.no_value = v; } // Mutable pointer to the field. - pub fn mut_no_value(&mut self) -> &mut ::std::vec::Vec { + pub fn mut_no_value( + &mut self, + ) -> &mut ::std::vec::Vec { &mut self.no_value } // Take field - pub fn take_no_value(&mut self) -> ::std::vec::Vec { + pub fn take_no_value( + &mut self, + ) -> ::std::vec::Vec { ::std::mem::replace(&mut self.no_value, ::std::vec::Vec::new()) } } @@ -1621,23 +1839,35 @@ impl ::protobuf::Message for ListAttributesPartialState { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.values)?; - }, - 2 => { - ::protobuf::rt::read_repeated_enum_with_unknown_fields_into(wire_type, is, &mut self.no_value, 2, &mut self.unknown_fields)? - }, + } + 2 => ::protobuf::rt::read_repeated_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.no_value, + 2, + &mut self.unknown_fields, + )?, _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1653,13 +1883,16 @@ impl ::protobuf::Message for ListAttributesPartialState { } for value in &self.no_value { my_size += ::protobuf::rt::enum_size(2, *value); - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.values.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -1667,7 +1900,7 @@ impl ::protobuf::Message for ListAttributesPartialState { } for v in &self.no_value { os.write_enum(2, v.value())?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1703,34 +1936,46 @@ impl ::protobuf::Message for ListAttributesPartialState { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "values", - |m: &ListAttributesPartialState| { &m.values }, - |m: &mut ListAttributesPartialState| { &mut m.values }, - )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage< + super::playlist4meta::ListAttributes, + >, + >( + "values", + |m: &ListAttributesPartialState| &m.values, + |m: &mut ListAttributesPartialState| &mut m.values, + ), + ); + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum< + ListAttributesPartialState_ListAttributeKind, + >, + >( "no_value", - |m: &ListAttributesPartialState| { &m.no_value }, - |m: &mut ListAttributesPartialState| { &mut m.no_value }, + |m: &ListAttributesPartialState| &m.no_value, + |m: &mut ListAttributesPartialState| &mut m.no_value, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "ListAttributesPartialState", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static ListAttributesPartialState { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(ListAttributesPartialState::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(ListAttributesPartialState::new) } } } @@ -1754,7 +1999,7 @@ impl ::protobuf::reflect::ProtobufValue for ListAttributesPartialState { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum ListAttributesPartialState_ListAttributeKind { LIST_UNKNOWN = 0, LIST_NAME = 1, @@ -1773,15 +2018,31 @@ impl ::protobuf::ProtobufEnum for ListAttributesPartialState_ListAttributeKind { fn from_i32(value: i32) -> ::std::option::Option { match value { - 0 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_UNKNOWN), - 1 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_NAME), - 2 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_DESCRIPTION), - 3 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_PICTURE), - 4 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_COLLABORATIVE), - 5 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_PL3_VERSION), - 6 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_DELETED_BY_OWNER), - 7 => ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_RESTRICTED_COLLABORATIVE), - _ => ::std::option::Option::None + 0 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_UNKNOWN, + ), + 1 => { + ::std::option::Option::Some(ListAttributesPartialState_ListAttributeKind::LIST_NAME) + } + 2 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_DESCRIPTION, + ), + 3 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_PICTURE, + ), + 4 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_COLLABORATIVE, + ), + 5 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_PL3_VERSION, + ), + 6 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_DELETED_BY_OWNER, + ), + 7 => ::std::option::Option::Some( + ListAttributesPartialState_ListAttributeKind::LIST_RESTRICTED_COLLABORATIVE, + ), + _ => ::std::option::Option::None, } } @@ -1800,17 +2061,22 @@ impl ::protobuf::ProtobufEnum for ListAttributesPartialState_ListAttributeKind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("ListAttributesPartialState.ListAttributeKind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::< + ListAttributesPartialState_ListAttributeKind, + >( + "ListAttributesPartialState.ListAttributeKind", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for ListAttributesPartialState_ListAttributeKind { -} +impl ::std::marker::Copy for ListAttributesPartialState_ListAttributeKind {} impl ::std::default::Default for ListAttributesPartialState_ListAttributeKind { fn default() -> Self { @@ -1824,7 +2090,7 @@ impl ::protobuf::reflect::ProtobufValue for ListAttributesPartialState_ListAttri } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct UpdateItemAttributes { // message fields index: ::std::option::Option, @@ -1850,7 +2116,6 @@ impl UpdateItemAttributes { // optional int32 index = 1; - pub fn get_index(&self) -> i32 { self.index.unwrap_or(0) } @@ -1869,9 +2134,10 @@ impl UpdateItemAttributes { // optional .ItemAttributesPartialState new_attributes = 2; - pub fn get_new_attributes(&self) -> &ItemAttributesPartialState { - self.new_attributes.as_ref().unwrap_or_else(|| ItemAttributesPartialState::default_instance()) + self.new_attributes + .as_ref() + .unwrap_or_else(|| ItemAttributesPartialState::default_instance()) } pub fn clear_new_attributes(&mut self) { self.new_attributes.clear(); @@ -1897,14 +2163,17 @@ impl UpdateItemAttributes { // Take field pub fn take_new_attributes(&mut self) -> ItemAttributesPartialState { - self.new_attributes.take().unwrap_or_else(|| ItemAttributesPartialState::new()) + self.new_attributes + .take() + .unwrap_or_else(|| ItemAttributesPartialState::new()) } // optional .ItemAttributesPartialState old_attributes = 3; - pub fn get_old_attributes(&self) -> &ItemAttributesPartialState { - self.old_attributes.as_ref().unwrap_or_else(|| ItemAttributesPartialState::default_instance()) + self.old_attributes + .as_ref() + .unwrap_or_else(|| ItemAttributesPartialState::default_instance()) } pub fn clear_old_attributes(&mut self) { self.old_attributes.clear(); @@ -1930,14 +2199,17 @@ impl UpdateItemAttributes { // Take field pub fn take_old_attributes(&mut self) -> ItemAttributesPartialState { - self.old_attributes.take().unwrap_or_else(|| ItemAttributesPartialState::new()) + self.old_attributes + .take() + .unwrap_or_else(|| ItemAttributesPartialState::new()) } // optional .ListChecksum list_checksum = 4; - pub fn get_list_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.list_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.list_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_list_checksum(&mut self) { self.list_checksum.clear(); @@ -1963,14 +2235,17 @@ impl UpdateItemAttributes { // Take field pub fn take_list_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.list_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.list_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListChecksum old_attributes_checksum = 5; - pub fn get_old_attributes_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.old_attributes_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.old_attributes_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_old_attributes_checksum(&mut self) { self.old_attributes_checksum.clear(); @@ -1996,7 +2271,9 @@ impl UpdateItemAttributes { // Take field pub fn take_old_attributes_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.old_attributes_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.old_attributes_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } } @@ -2006,51 +2283,77 @@ impl ::protobuf::Message for UpdateItemAttributes { if !v.is_initialized() { return false; } - }; + } for v in &self.old_attributes { if !v.is_initialized() { return false; } - }; + } for v in &self.list_checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.old_attributes_checksum { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.index = ::std::option::Option::Some(tmp); - }, + } 2 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.new_attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.new_attributes, + )?; + } 3 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.old_attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.old_attributes, + )?; + } 4 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.list_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.list_checksum, + )?; + } 5 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.old_attributes_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.old_attributes_checksum, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2084,7 +2387,10 @@ impl ::protobuf::Message for UpdateItemAttributes { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.index { os.write_int32(1, v)?; } @@ -2143,49 +2449,72 @@ impl ::protobuf::Message for UpdateItemAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "index", - |m: &UpdateItemAttributes| { &m.index }, - |m: &mut UpdateItemAttributes| { &mut m.index }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "new_attributes", - |m: &UpdateItemAttributes| { &m.new_attributes }, - |m: &mut UpdateItemAttributes| { &mut m.new_attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "old_attributes", - |m: &UpdateItemAttributes| { &m.old_attributes }, - |m: &mut UpdateItemAttributes| { &mut m.old_attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "list_checksum", - |m: &UpdateItemAttributes| { &m.list_checksum }, - |m: &mut UpdateItemAttributes| { &mut m.list_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "old_attributes_checksum", - |m: &UpdateItemAttributes| { &m.old_attributes_checksum }, - |m: &mut UpdateItemAttributes| { &mut m.old_attributes_checksum }, + |m: &UpdateItemAttributes| &m.index, + |m: &mut UpdateItemAttributes| &mut m.index, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "new_attributes", + |m: &UpdateItemAttributes| &m.new_attributes, + |m: &mut UpdateItemAttributes| &mut m.new_attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "old_attributes", + |m: &UpdateItemAttributes| &m.old_attributes, + |m: &mut UpdateItemAttributes| &mut m.old_attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "list_checksum", + |m: &UpdateItemAttributes| &m.list_checksum, + |m: &mut UpdateItemAttributes| &mut m.list_checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "old_attributes_checksum", + |m: &UpdateItemAttributes| &m.old_attributes_checksum, + |m: &mut UpdateItemAttributes| &mut m.old_attributes_checksum, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UpdateItemAttributes", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static UpdateItemAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(UpdateItemAttributes::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(UpdateItemAttributes::new) } } } @@ -2212,7 +2541,7 @@ impl ::protobuf::reflect::ProtobufValue for UpdateItemAttributes { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct UpdateListAttributes { // message fields new_attributes: ::protobuf::SingularPtrField, @@ -2237,9 +2566,10 @@ impl UpdateListAttributes { // optional .ListAttributesPartialState new_attributes = 1; - pub fn get_new_attributes(&self) -> &ListAttributesPartialState { - self.new_attributes.as_ref().unwrap_or_else(|| ListAttributesPartialState::default_instance()) + self.new_attributes + .as_ref() + .unwrap_or_else(|| ListAttributesPartialState::default_instance()) } pub fn clear_new_attributes(&mut self) { self.new_attributes.clear(); @@ -2265,14 +2595,17 @@ impl UpdateListAttributes { // Take field pub fn take_new_attributes(&mut self) -> ListAttributesPartialState { - self.new_attributes.take().unwrap_or_else(|| ListAttributesPartialState::new()) + self.new_attributes + .take() + .unwrap_or_else(|| ListAttributesPartialState::new()) } // optional .ListAttributesPartialState old_attributes = 2; - pub fn get_old_attributes(&self) -> &ListAttributesPartialState { - self.old_attributes.as_ref().unwrap_or_else(|| ListAttributesPartialState::default_instance()) + self.old_attributes + .as_ref() + .unwrap_or_else(|| ListAttributesPartialState::default_instance()) } pub fn clear_old_attributes(&mut self) { self.old_attributes.clear(); @@ -2298,14 +2631,17 @@ impl UpdateListAttributes { // Take field pub fn take_old_attributes(&mut self) -> ListAttributesPartialState { - self.old_attributes.take().unwrap_or_else(|| ListAttributesPartialState::new()) + self.old_attributes + .take() + .unwrap_or_else(|| ListAttributesPartialState::new()) } // optional .ListChecksum list_checksum = 3; - pub fn get_list_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.list_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.list_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_list_checksum(&mut self) { self.list_checksum.clear(); @@ -2331,14 +2667,17 @@ impl UpdateListAttributes { // Take field pub fn take_list_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.list_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.list_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } // optional .ListChecksum old_attributes_checksum = 4; - pub fn get_old_attributes_checksum(&self) -> &super::playlist4meta::ListChecksum { - self.old_attributes_checksum.as_ref().unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) + self.old_attributes_checksum + .as_ref() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::default_instance()) } pub fn clear_old_attributes_checksum(&mut self) { self.old_attributes_checksum.clear(); @@ -2364,7 +2703,9 @@ impl UpdateListAttributes { // Take field pub fn take_old_attributes_checksum(&mut self) -> super::playlist4meta::ListChecksum { - self.old_attributes_checksum.take().unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) + self.old_attributes_checksum + .take() + .unwrap_or_else(|| super::playlist4meta::ListChecksum::new()) } } @@ -2374,44 +2715,68 @@ impl ::protobuf::Message for UpdateListAttributes { if !v.is_initialized() { return false; } - }; + } for v in &self.old_attributes { if !v.is_initialized() { return false; } - }; + } for v in &self.list_checksum { if !v.is_initialized() { return false; } - }; + } for v in &self.old_attributes_checksum { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.new_attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.new_attributes, + )?; + } 2 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.old_attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.old_attributes, + )?; + } 3 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.list_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.list_checksum, + )?; + } 4 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.old_attributes_checksum)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.old_attributes_checksum, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2442,7 +2807,10 @@ impl ::protobuf::Message for UpdateListAttributes { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.new_attributes.as_ref() { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2498,44 +2866,64 @@ impl ::protobuf::Message for UpdateListAttributes { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "new_attributes", - |m: &UpdateListAttributes| { &m.new_attributes }, - |m: &mut UpdateListAttributes| { &mut m.new_attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "old_attributes", - |m: &UpdateListAttributes| { &m.old_attributes }, - |m: &mut UpdateListAttributes| { &mut m.old_attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "list_checksum", - |m: &UpdateListAttributes| { &m.list_checksum }, - |m: &mut UpdateListAttributes| { &mut m.list_checksum }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "old_attributes_checksum", - |m: &UpdateListAttributes| { &m.old_attributes_checksum }, - |m: &mut UpdateListAttributes| { &mut m.old_attributes_checksum }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "new_attributes", + |m: &UpdateListAttributes| &m.new_attributes, + |m: &mut UpdateListAttributes| &mut m.new_attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "old_attributes", + |m: &UpdateListAttributes| &m.old_attributes, + |m: &mut UpdateListAttributes| &mut m.old_attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "list_checksum", + |m: &UpdateListAttributes| &m.list_checksum, + |m: &mut UpdateListAttributes| &mut m.list_checksum, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "old_attributes_checksum", + |m: &UpdateListAttributes| &m.old_attributes_checksum, + |m: &mut UpdateListAttributes| &mut m.old_attributes_checksum, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "UpdateListAttributes", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } } fn default_instance() -> &'static UpdateListAttributes { - static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(UpdateListAttributes::new) - } + static mut instance: ::protobuf::lazy::Lazy = + ::protobuf::lazy::Lazy::INIT; + unsafe { instance.get(UpdateListAttributes::new) } } } @@ -2561,7 +2949,7 @@ impl ::protobuf::reflect::ProtobufValue for UpdateListAttributes { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Op { // message fields kind: ::std::option::Option, @@ -2588,7 +2976,6 @@ impl Op { // optional .Op.Kind kind = 1; - pub fn get_kind(&self) -> Op_Kind { self.kind.unwrap_or(Op_Kind::KIND_UNKNOWN) } @@ -2607,7 +2994,6 @@ impl Op { // optional .Add add = 2; - pub fn get_add(&self) -> &Add { self.add.as_ref().unwrap_or_else(|| Add::default_instance()) } @@ -2640,7 +3026,6 @@ impl Op { // optional .Rem rem = 3; - pub fn get_rem(&self) -> &Rem { self.rem.as_ref().unwrap_or_else(|| Rem::default_instance()) } @@ -2673,7 +3058,6 @@ impl Op { // optional .Mov mov = 4; - pub fn get_mov(&self) -> &Mov { self.mov.as_ref().unwrap_or_else(|| Mov::default_instance()) } @@ -2706,9 +3090,10 @@ impl Op { // optional .UpdateItemAttributes update_item_attributes = 5; - pub fn get_update_item_attributes(&self) -> &UpdateItemAttributes { - self.update_item_attributes.as_ref().unwrap_or_else(|| UpdateItemAttributes::default_instance()) + self.update_item_attributes + .as_ref() + .unwrap_or_else(|| UpdateItemAttributes::default_instance()) } pub fn clear_update_item_attributes(&mut self) { self.update_item_attributes.clear(); @@ -2734,14 +3119,17 @@ impl Op { // Take field pub fn take_update_item_attributes(&mut self) -> UpdateItemAttributes { - self.update_item_attributes.take().unwrap_or_else(|| UpdateItemAttributes::new()) + self.update_item_attributes + .take() + .unwrap_or_else(|| UpdateItemAttributes::new()) } // optional .UpdateListAttributes update_list_attributes = 6; - pub fn get_update_list_attributes(&self) -> &UpdateListAttributes { - self.update_list_attributes.as_ref().unwrap_or_else(|| UpdateListAttributes::default_instance()) + self.update_list_attributes + .as_ref() + .unwrap_or_else(|| UpdateListAttributes::default_instance()) } pub fn clear_update_list_attributes(&mut self) { self.update_list_attributes.clear(); @@ -2767,7 +3155,9 @@ impl Op { // Take field pub fn take_update_list_attributes(&mut self) -> UpdateListAttributes { - self.update_list_attributes.take().unwrap_or_else(|| UpdateListAttributes::new()) + self.update_list_attributes + .take() + .unwrap_or_else(|| UpdateListAttributes::new()) } } @@ -2777,55 +3167,75 @@ impl ::protobuf::Message for Op { if !v.is_initialized() { return false; } - }; + } for v in &self.rem { if !v.is_initialized() { return false; } - }; + } for v in &self.mov { if !v.is_initialized() { return false; } - }; + } for v in &self.update_item_attributes { if !v.is_initialized() { return false; } - }; + } for v in &self.update_list_attributes { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.kind, 1, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.kind, + 1, + &mut self.unknown_fields, + )?, 2 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.add)?; - }, + } 3 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.rem)?; - }, + } 4 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.mov)?; - }, + } 5 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.update_item_attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.update_item_attributes, + )?; + } 6 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.update_list_attributes)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.update_list_attributes, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2863,7 +3273,10 @@ impl ::protobuf::Message for Op { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.kind { os.write_enum(1, v.value())?; } @@ -2927,44 +3340,59 @@ impl ::protobuf::Message for Op { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( - "kind", - |m: &Op| { &m.kind }, - |m: &mut Op| { &mut m.kind }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "add", - |m: &Op| { &m.add }, - |m: &mut Op| { &mut m.add }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "rem", - |m: &Op| { &m.rem }, - |m: &mut Op| { &mut m.rem }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "mov", - |m: &Op| { &m.mov }, - |m: &mut Op| { &mut m.mov }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "update_item_attributes", - |m: &Op| { &m.update_item_attributes }, - |m: &mut Op| { &mut m.update_item_attributes }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "update_list_attributes", - |m: &Op| { &m.update_list_attributes }, - |m: &mut Op| { &mut m.update_list_attributes }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( + "kind", |m: &Op| &m.kind, |m: &mut Op| &mut m.kind )); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("add", |m: &Op| &m.add, |m: &mut Op| &mut m.add), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("rem", |m: &Op| &m.rem, |m: &mut Op| &mut m.rem), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("mov", |m: &Op| &m.mov, |m: &mut Op| &mut m.mov), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "update_item_attributes", + |m: &Op| &m.update_item_attributes, + |m: &mut Op| &mut m.update_item_attributes, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "update_list_attributes", + |m: &Op| &m.update_list_attributes, + |m: &mut Op| &mut m.update_list_attributes, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Op", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2972,9 +3400,7 @@ impl ::protobuf::Message for Op { fn default_instance() -> &'static Op { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Op::new) - } + unsafe { instance.get(Op::new) } } } @@ -3002,7 +3428,7 @@ impl ::protobuf::reflect::ProtobufValue for Op { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum Op_Kind { KIND_UNKNOWN = 0, ADD = 2, @@ -3025,7 +3451,7 @@ impl ::protobuf::ProtobufEnum for Op_Kind { 4 => ::std::option::Option::Some(Op_Kind::MOV), 5 => ::std::option::Option::Some(Op_Kind::UPDATE_ITEM_ATTRIBUTES), 6 => ::std::option::Option::Some(Op_Kind::UPDATE_LIST_ATTRIBUTES), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -3042,17 +3468,20 @@ impl ::protobuf::ProtobufEnum for Op_Kind { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("Op.Kind", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "Op.Kind", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for Op_Kind { -} +impl ::std::marker::Copy for Op_Kind {} impl ::std::default::Default for Op_Kind { fn default() -> Self { @@ -3066,7 +3495,7 @@ impl ::protobuf::reflect::ProtobufValue for Op_Kind { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct OpList { // message fields ops: ::protobuf::RepeatedField, @@ -3088,7 +3517,6 @@ impl OpList { // repeated .Op ops = 1; - pub fn get_ops(&self) -> &[Op] { &self.ops } @@ -3118,20 +3546,28 @@ impl ::protobuf::Message for OpList { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.ops)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3144,18 +3580,21 @@ impl ::protobuf::Message for OpList { for value in &self.ops { let len = value.compute_size(); my_size += 1 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { for v in &self.ops { os.write_tag(1, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -3191,19 +3630,21 @@ impl ::protobuf::Message for OpList { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "ops", - |m: &OpList| { &m.ops }, - |m: &mut OpList| { &mut m.ops }, - )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("ops", |m: &OpList| &m.ops, |m: &mut OpList| &mut m.ops), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "OpList", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3211,9 +3652,7 @@ impl ::protobuf::Message for OpList { fn default_instance() -> &'static OpList { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(OpList::new) - } + unsafe { instance.get(OpList::new) } } } @@ -3290,16 +3729,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ \x18\x01\x20\x03(\x0b2\x03.OpB\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/pubsub.rs b/protocol/src/pubsub.rs index 15d4e2a0..29ee2031 100644 --- a/protocol/src/pubsub.rs +++ b/protocol/src/pubsub.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Subscription { // message fields uri: ::protobuf::SingularField<::std::string::String>, @@ -50,7 +50,6 @@ impl Subscription { // optional string uri = 1; - pub fn get_uri(&self) -> &str { match self.uri.as_ref() { Some(v) => &v, @@ -81,12 +80,13 @@ impl Subscription { // Take field pub fn take_uri(&mut self) -> ::std::string::String { - self.uri.take().unwrap_or_else(|| ::std::string::String::new()) + self.uri + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional int32 expiry = 2; - pub fn get_expiry(&self) -> i32 { self.expiry.unwrap_or(0) } @@ -105,7 +105,6 @@ impl Subscription { // optional int32 status_code = 3; - pub fn get_status_code(&self) -> i32 { self.status_code.unwrap_or(0) } @@ -128,30 +127,42 @@ impl ::protobuf::Message for Subscription { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.uri)?; - }, + } 2 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.expiry = ::std::option::Option::Some(tmp); - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.status_code = ::std::option::Option::Some(tmp); - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -175,7 +186,10 @@ impl ::protobuf::Message for Subscription { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.uri.as_ref() { os.write_string(1, &v)?; } @@ -220,29 +234,41 @@ impl ::protobuf::Message for Subscription { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "uri", - |m: &Subscription| { &m.uri }, - |m: &mut Subscription| { &mut m.uri }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "uri", + |m: &Subscription| &m.uri, + |m: &mut Subscription| &mut m.uri, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "expiry", - |m: &Subscription| { &m.expiry }, - |m: &mut Subscription| { &mut m.expiry }, + |m: &Subscription| &m.expiry, + |m: &mut Subscription| &mut m.expiry, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "status_code", - |m: &Subscription| { &m.status_code }, - |m: &mut Subscription| { &mut m.status_code }, + |m: &Subscription| &m.status_code, + |m: &mut Subscription| &mut m.status_code, )); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Subscription", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -250,9 +276,7 @@ impl ::protobuf::Message for Subscription { fn default_instance() -> &'static Subscription { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Subscription::new) - } + unsafe { instance.get(Subscription::new) } } } @@ -283,16 +307,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ us_code\x18\x03\x20\x01(\x05B\0:\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } diff --git a/protocol/src/spirc.rs b/protocol/src/spirc.rs index ee626a2a..de0f7ae4 100644 --- a/protocol/src/spirc.rs +++ b/protocol/src/spirc.rs @@ -26,7 +26,7 @@ use protobuf::ProtobufEnum as ProtobufEnum_imported_for_functions; /// of protobuf runtime. // const _PROTOBUF_VERSION_CHECK: () = ::protobuf::VERSION_2_14_0; -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Frame { // message fields version: ::std::option::Option, @@ -62,7 +62,6 @@ impl Frame { // optional uint32 version = 1; - pub fn get_version(&self) -> u32 { self.version.unwrap_or(0) } @@ -81,7 +80,6 @@ impl Frame { // optional string ident = 2; - pub fn get_ident(&self) -> &str { match self.ident.as_ref() { Some(v) => &v, @@ -112,12 +110,13 @@ impl Frame { // Take field pub fn take_ident(&mut self) -> ::std::string::String { - self.ident.take().unwrap_or_else(|| ::std::string::String::new()) + self.ident + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string protocol_version = 3; - pub fn get_protocol_version(&self) -> &str { match self.protocol_version.as_ref() { Some(v) => &v, @@ -148,12 +147,13 @@ impl Frame { // Take field pub fn take_protocol_version(&mut self) -> ::std::string::String { - self.protocol_version.take().unwrap_or_else(|| ::std::string::String::new()) + self.protocol_version + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional uint32 seq_nr = 4; - pub fn get_seq_nr(&self) -> u32 { self.seq_nr.unwrap_or(0) } @@ -172,7 +172,6 @@ impl Frame { // optional .MessageType typ = 5; - pub fn get_typ(&self) -> MessageType { self.typ.unwrap_or(MessageType::kMessageTypeHello) } @@ -191,9 +190,10 @@ impl Frame { // optional .DeviceState device_state = 7; - pub fn get_device_state(&self) -> &DeviceState { - self.device_state.as_ref().unwrap_or_else(|| DeviceState::default_instance()) + self.device_state + .as_ref() + .unwrap_or_else(|| DeviceState::default_instance()) } pub fn clear_device_state(&mut self) { self.device_state.clear(); @@ -219,14 +219,17 @@ impl Frame { // Take field pub fn take_device_state(&mut self) -> DeviceState { - self.device_state.take().unwrap_or_else(|| DeviceState::new()) + self.device_state + .take() + .unwrap_or_else(|| DeviceState::new()) } // optional .Goodbye goodbye = 11; - pub fn get_goodbye(&self) -> &Goodbye { - self.goodbye.as_ref().unwrap_or_else(|| Goodbye::default_instance()) + self.goodbye + .as_ref() + .unwrap_or_else(|| Goodbye::default_instance()) } pub fn clear_goodbye(&mut self) { self.goodbye.clear(); @@ -257,9 +260,10 @@ impl Frame { // optional .State state = 12; - pub fn get_state(&self) -> &State { - self.state.as_ref().unwrap_or_else(|| State::default_instance()) + self.state + .as_ref() + .unwrap_or_else(|| State::default_instance()) } pub fn clear_state(&mut self) { self.state.clear(); @@ -290,7 +294,6 @@ impl Frame { // optional uint32 position = 13; - pub fn get_position(&self) -> u32 { self.position.unwrap_or(0) } @@ -309,7 +312,6 @@ impl Frame { // optional uint32 volume = 14; - pub fn get_volume(&self) -> u32 { self.volume.unwrap_or(0) } @@ -328,7 +330,6 @@ impl Frame { // optional int64 state_update_id = 17; - pub fn get_state_update_id(&self) -> i64 { self.state_update_id.unwrap_or(0) } @@ -347,7 +348,6 @@ impl Frame { // repeated string recipient = 18; - pub fn get_recipient(&self) -> &[::std::string::String] { &self.recipient } @@ -372,7 +372,6 @@ impl Frame { // optional bytes context_player_state = 19; - pub fn get_context_player_state(&self) -> &[u8] { match self.context_player_state.as_ref() { Some(v) => &v, @@ -403,12 +402,13 @@ impl Frame { // Take field pub fn take_context_player_state(&mut self) -> ::std::vec::Vec { - self.context_player_state.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.context_player_state + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional string new_name = 20; - pub fn get_new_name(&self) -> &str { match self.new_name.as_ref() { Some(v) => &v, @@ -439,14 +439,17 @@ impl Frame { // Take field pub fn take_new_name(&mut self) -> ::std::string::String { - self.new_name.take().unwrap_or_else(|| ::std::string::String::new()) + self.new_name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional .Metadata metadata = 25; - pub fn get_metadata(&self) -> &Metadata { - self.metadata.as_ref().unwrap_or_else(|| Metadata::default_instance()) + self.metadata + .as_ref() + .unwrap_or_else(|| Metadata::default_instance()) } pub fn clear_metadata(&mut self) { self.metadata.clear(); @@ -482,97 +485,131 @@ impl ::protobuf::Message for Frame { if !v.is_initialized() { return false; } - }; + } for v in &self.goodbye { if !v.is_initialized() { return false; } - }; + } for v in &self.state { if !v.is_initialized() { return false; } - }; + } for v in &self.metadata { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.version = ::std::option::Option::Some(tmp); - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.ident)?; - }, + } 3 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.protocol_version)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.protocol_version, + )?; + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.seq_nr = ::std::option::Option::Some(tmp); - }, - 5 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.typ, 5, &mut self.unknown_fields)? - }, + } + 5 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.typ, + 5, + &mut self.unknown_fields, + )?, 7 => { - ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.device_state)?; - }, + ::protobuf::rt::read_singular_message_into( + wire_type, + is, + &mut self.device_state, + )?; + } 11 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.goodbye)?; - }, + } 12 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.state)?; - }, + } 13 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.position = ::std::option::Option::Some(tmp); - }, + } 14 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.volume = ::std::option::Option::Some(tmp); - }, + } 17 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.state_update_id = ::std::option::Option::Some(tmp); - }, + } 18 => { ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.recipient)?; - }, + } 19 => { - ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.context_player_state)?; - }, + ::protobuf::rt::read_singular_bytes_into( + wire_type, + is, + &mut self.context_player_state, + )?; + } 20 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.new_name)?; - }, + } 25 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.metadata)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -620,7 +657,7 @@ impl ::protobuf::Message for Frame { } for value in &self.recipient { my_size += ::protobuf::rt::string_size(18, &value); - }; + } if let Some(ref v) = self.context_player_state.as_ref() { my_size += ::protobuf::rt::bytes_size(19, &v); } @@ -636,7 +673,10 @@ impl ::protobuf::Message for Frame { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.version { os.write_uint32(1, v)?; } @@ -678,7 +718,7 @@ impl ::protobuf::Message for Frame { } for v in &self.recipient { os.write_string(18, &v)?; - }; + } if let Some(ref v) = self.context_player_state.as_ref() { os.write_bytes(19, &v)?; } @@ -725,89 +765,147 @@ impl ::protobuf::Message for Frame { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "version", - |m: &Frame| { &m.version }, - |m: &mut Frame| { &mut m.version }, + |m: &Frame| &m.version, + |m: &mut Frame| &mut m.version, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "ident", - |m: &Frame| { &m.ident }, - |m: &mut Frame| { &mut m.ident }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "protocol_version", - |m: &Frame| { &m.protocol_version }, - |m: &mut Frame| { &mut m.protocol_version }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "ident", |m: &Frame| &m.ident, |m: &mut Frame| &mut m.ident + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "protocol_version", + |m: &Frame| &m.protocol_version, + |m: &mut Frame| &mut m.protocol_version, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "seq_nr", - |m: &Frame| { &m.seq_nr }, - |m: &mut Frame| { &mut m.seq_nr }, + |m: &Frame| &m.seq_nr, + |m: &mut Frame| &mut m.seq_nr, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( - "typ", - |m: &Frame| { &m.typ }, - |m: &mut Frame| { &mut m.typ }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( + "typ", |m: &Frame| &m.typ, |m: &mut Frame| &mut m.typ )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "device_state", - |m: &Frame| { &m.device_state }, - |m: &mut Frame| { &mut m.device_state }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "goodbye", - |m: &Frame| { &m.goodbye }, - |m: &mut Frame| { &mut m.goodbye }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "state", - |m: &Frame| { &m.state }, - |m: &mut Frame| { &mut m.state }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "device_state", + |m: &Frame| &m.device_state, + |m: &mut Frame| &mut m.device_state, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "goodbye", + |m: &Frame| &m.goodbye, + |m: &mut Frame| &mut m.goodbye, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "state", |m: &Frame| &m.state, |m: &mut Frame| &mut m.state + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "position", - |m: &Frame| { &m.position }, - |m: &mut Frame| { &mut m.position }, + |m: &Frame| &m.position, + |m: &mut Frame| &mut m.position, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "volume", - |m: &Frame| { &m.volume }, - |m: &mut Frame| { &mut m.volume }, + |m: &Frame| &m.volume, + |m: &mut Frame| &mut m.volume, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "state_update_id", - |m: &Frame| { &m.state_update_id }, - |m: &mut Frame| { &mut m.state_update_id }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "recipient", - |m: &Frame| { &m.recipient }, - |m: &mut Frame| { &mut m.recipient }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "context_player_state", - |m: &Frame| { &m.context_player_state }, - |m: &mut Frame| { &mut m.context_player_state }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "new_name", - |m: &Frame| { &m.new_name }, - |m: &mut Frame| { &mut m.new_name }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "metadata", - |m: &Frame| { &m.metadata }, - |m: &mut Frame| { &mut m.metadata }, + |m: &Frame| &m.state_update_id, + |m: &mut Frame| &mut m.state_update_id, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "recipient", + |m: &Frame| &m.recipient, + |m: &mut Frame| &mut m.recipient, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "context_player_state", + |m: &Frame| &m.context_player_state, + |m: &mut Frame| &mut m.context_player_state, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "new_name", + |m: &Frame| &m.new_name, + |m: &mut Frame| &mut m.new_name, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "metadata", + |m: &Frame| &m.metadata, + |m: &mut Frame| &mut m.metadata, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Frame", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -815,9 +913,7 @@ impl ::protobuf::Message for Frame { fn default_instance() -> &'static Frame { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Frame::new) - } + unsafe { instance.get(Frame::new) } } } @@ -854,7 +950,7 @@ impl ::protobuf::reflect::ProtobufValue for Frame { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct DeviceState { // message fields sw_version: ::protobuf::SingularField<::std::string::String>, @@ -886,7 +982,6 @@ impl DeviceState { // optional string sw_version = 1; - pub fn get_sw_version(&self) -> &str { match self.sw_version.as_ref() { Some(v) => &v, @@ -917,12 +1012,13 @@ impl DeviceState { // Take field pub fn take_sw_version(&mut self) -> ::std::string::String { - self.sw_version.take().unwrap_or_else(|| ::std::string::String::new()) + self.sw_version + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool is_active = 10; - pub fn get_is_active(&self) -> bool { self.is_active.unwrap_or(false) } @@ -941,7 +1037,6 @@ impl DeviceState { // optional bool can_play = 11; - pub fn get_can_play(&self) -> bool { self.can_play.unwrap_or(false) } @@ -960,7 +1055,6 @@ impl DeviceState { // optional uint32 volume = 12; - pub fn get_volume(&self) -> u32 { self.volume.unwrap_or(0) } @@ -979,7 +1073,6 @@ impl DeviceState { // optional string name = 13; - pub fn get_name(&self) -> &str { match self.name.as_ref() { Some(v) => &v, @@ -1010,12 +1103,13 @@ impl DeviceState { // Take field pub fn take_name(&mut self) -> ::std::string::String { - self.name.take().unwrap_or_else(|| ::std::string::String::new()) + self.name + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional uint32 error_code = 14; - pub fn get_error_code(&self) -> u32 { self.error_code.unwrap_or(0) } @@ -1034,7 +1128,6 @@ impl DeviceState { // optional int64 became_active_at = 15; - pub fn get_became_active_at(&self) -> i64 { self.became_active_at.unwrap_or(0) } @@ -1053,7 +1146,6 @@ impl DeviceState { // optional string error_message = 16; - pub fn get_error_message(&self) -> &str { match self.error_message.as_ref() { Some(v) => &v, @@ -1084,12 +1176,13 @@ impl DeviceState { // Take field pub fn take_error_message(&mut self) -> ::std::string::String { - self.error_message.take().unwrap_or_else(|| ::std::string::String::new()) + self.error_message + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Capability capabilities = 17; - pub fn get_capabilities(&self) -> &[Capability] { &self.capabilities } @@ -1114,7 +1207,6 @@ impl DeviceState { // optional string context_player_error = 20; - pub fn get_context_player_error(&self) -> &str { match self.context_player_error.as_ref() { Some(v) => &v, @@ -1145,12 +1237,13 @@ impl DeviceState { // Take field pub fn take_context_player_error(&mut self) -> ::std::string::String { - self.context_player_error.take().unwrap_or_else(|| ::std::string::String::new()) + self.context_player_error + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // repeated .Metadata metadata = 25; - pub fn get_metadata(&self) -> &[Metadata] { &self.metadata } @@ -1180,75 +1273,105 @@ impl ::protobuf::Message for DeviceState { if !v.is_initialized() { return false; } - }; + } for v in &self.metadata { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.sw_version)?; - }, + } 10 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.is_active = ::std::option::Option::Some(tmp); - }, + } 11 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.can_play = ::std::option::Option::Some(tmp); - }, + } 12 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.volume = ::std::option::Option::Some(tmp); - }, + } 13 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.name)?; - }, + } 14 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.error_code = ::std::option::Option::Some(tmp); - }, + } 15 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int64()?; self.became_active_at = ::std::option::Option::Some(tmp); - }, + } 16 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.error_message)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.error_message, + )?; + } 17 => { - ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.capabilities)?; - }, + ::protobuf::rt::read_repeated_message_into( + wire_type, + is, + &mut self.capabilities, + )?; + } 20 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.context_player_error)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.context_player_error, + )?; + } 25 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.metadata)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1285,20 +1408,23 @@ impl ::protobuf::Message for DeviceState { for value in &self.capabilities { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.context_player_error.as_ref() { my_size += ::protobuf::rt::string_size(20, &v); } for value in &self.metadata { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.sw_version.as_ref() { os.write_string(1, &v)?; } @@ -1327,7 +1453,7 @@ impl ::protobuf::Message for DeviceState { os.write_tag(17, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.context_player_error.as_ref() { os.write_string(20, &v)?; } @@ -1335,7 +1461,7 @@ impl ::protobuf::Message for DeviceState { os.write_tag(25, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1371,69 +1497,115 @@ impl ::protobuf::Message for DeviceState { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "sw_version", - |m: &DeviceState| { &m.sw_version }, - |m: &mut DeviceState| { &mut m.sw_version }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "sw_version", + |m: &DeviceState| &m.sw_version, + |m: &mut DeviceState| &mut m.sw_version, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "is_active", - |m: &DeviceState| { &m.is_active }, - |m: &mut DeviceState| { &mut m.is_active }, + |m: &DeviceState| &m.is_active, + |m: &mut DeviceState| &mut m.is_active, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "can_play", - |m: &DeviceState| { &m.can_play }, - |m: &mut DeviceState| { &mut m.can_play }, + |m: &DeviceState| &m.can_play, + |m: &mut DeviceState| &mut m.can_play, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "volume", - |m: &DeviceState| { &m.volume }, - |m: &mut DeviceState| { &mut m.volume }, + |m: &DeviceState| &m.volume, + |m: &mut DeviceState| &mut m.volume, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "name", - |m: &DeviceState| { &m.name }, - |m: &mut DeviceState| { &mut m.name }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "name", + |m: &DeviceState| &m.name, + |m: &mut DeviceState| &mut m.name, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "error_code", - |m: &DeviceState| { &m.error_code }, - |m: &mut DeviceState| { &mut m.error_code }, + |m: &DeviceState| &m.error_code, + |m: &mut DeviceState| &mut m.error_code, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "became_active_at", - |m: &DeviceState| { &m.became_active_at }, - |m: &mut DeviceState| { &mut m.became_active_at }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "error_message", - |m: &DeviceState| { &m.error_message }, - |m: &mut DeviceState| { &mut m.error_message }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "capabilities", - |m: &DeviceState| { &m.capabilities }, - |m: &mut DeviceState| { &mut m.capabilities }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "context_player_error", - |m: &DeviceState| { &m.context_player_error }, - |m: &mut DeviceState| { &mut m.context_player_error }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "metadata", - |m: &DeviceState| { &m.metadata }, - |m: &mut DeviceState| { &mut m.metadata }, + |m: &DeviceState| &m.became_active_at, + |m: &mut DeviceState| &mut m.became_active_at, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "error_message", + |m: &DeviceState| &m.error_message, + |m: &mut DeviceState| &mut m.error_message, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "capabilities", + |m: &DeviceState| &m.capabilities, + |m: &mut DeviceState| &mut m.capabilities, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "context_player_error", + |m: &DeviceState| &m.context_player_error, + |m: &mut DeviceState| &mut m.context_player_error, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "metadata", + |m: &DeviceState| &m.metadata, + |m: &mut DeviceState| &mut m.metadata, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "DeviceState", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1441,9 +1613,7 @@ impl ::protobuf::Message for DeviceState { fn default_instance() -> &'static DeviceState { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(DeviceState::new) - } + unsafe { instance.get(DeviceState::new) } } } @@ -1476,7 +1646,7 @@ impl ::protobuf::reflect::ProtobufValue for DeviceState { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Capability { // message fields typ: ::std::option::Option, @@ -1500,7 +1670,6 @@ impl Capability { // optional .CapabilityType typ = 1; - pub fn get_typ(&self) -> CapabilityType { self.typ.unwrap_or(CapabilityType::kSupportedContexts) } @@ -1519,7 +1688,6 @@ impl Capability { // repeated int64 intValue = 2; - pub fn get_intValue(&self) -> &[i64] { &self.intValue } @@ -1544,7 +1712,6 @@ impl Capability { // repeated string stringValue = 3; - pub fn get_stringValue(&self) -> &[::std::string::String] { &self.stringValue } @@ -1573,22 +1740,38 @@ impl ::protobuf::Message for Capability { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { - 1 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.typ, 1, &mut self.unknown_fields)? - }, + 1 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.typ, + 1, + &mut self.unknown_fields, + )?, 2 => { ::protobuf::rt::read_repeated_int64_into(wire_type, is, &mut self.intValue)?; - }, + } 3 => { - ::protobuf::rt::read_repeated_string_into(wire_type, is, &mut self.stringValue)?; - }, + ::protobuf::rt::read_repeated_string_into( + wire_type, + is, + &mut self.stringValue, + )?; + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1602,26 +1785,30 @@ impl ::protobuf::Message for Capability { my_size += ::protobuf::rt::enum_size(1, v); } for value in &self.intValue { - my_size += ::protobuf::rt::value_size(2, *value, ::protobuf::wire_format::WireTypeVarint); - }; + my_size += + ::protobuf::rt::value_size(2, *value, ::protobuf::wire_format::WireTypeVarint); + } for value in &self.stringValue { my_size += ::protobuf::rt::string_size(3, &value); - }; + } my_size += ::protobuf::rt::unknown_fields_size(self.get_unknown_fields()); self.cached_size.set(my_size); my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.typ { os.write_enum(1, v.value())?; } for v in &self.intValue { os.write_int64(2, *v)?; - }; + } for v in &self.stringValue { os.write_string(3, &v)?; - }; + } os.write_unknown_fields(self.get_unknown_fields())?; ::std::result::Result::Ok(()) } @@ -1657,29 +1844,41 @@ impl ::protobuf::Message for Capability { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "typ", - |m: &Capability| { &m.typ }, - |m: &mut Capability| { &mut m.typ }, + |m: &Capability| &m.typ, + |m: &mut Capability| &mut m.typ, )); - fields.push(::protobuf::reflect::accessor::make_vec_accessor::<_, ::protobuf::types::ProtobufTypeInt64>( + fields.push(::protobuf::reflect::accessor::make_vec_accessor::< + _, + ::protobuf::types::ProtobufTypeInt64, + >( "intValue", - |m: &Capability| { &m.intValue }, - |m: &mut Capability| { &mut m.intValue }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "stringValue", - |m: &Capability| { &m.stringValue }, - |m: &mut Capability| { &mut m.stringValue }, + |m: &Capability| &m.intValue, + |m: &mut Capability| &mut m.intValue, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "stringValue", + |m: &Capability| &m.stringValue, + |m: &mut Capability| &mut m.stringValue, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Capability", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1687,9 +1886,7 @@ impl ::protobuf::Message for Capability { fn default_instance() -> &'static Capability { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Capability::new) - } + unsafe { instance.get(Capability::new) } } } @@ -1714,7 +1911,7 @@ impl ::protobuf::reflect::ProtobufValue for Capability { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Goodbye { // message fields reason: ::protobuf::SingularField<::std::string::String>, @@ -1736,7 +1933,6 @@ impl Goodbye { // optional string reason = 1; - pub fn get_reason(&self) -> &str { match self.reason.as_ref() { Some(v) => &v, @@ -1767,7 +1963,9 @@ impl Goodbye { // Take field pub fn take_reason(&mut self) -> ::std::string::String { - self.reason.take().unwrap_or_else(|| ::std::string::String::new()) + self.reason + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -1776,16 +1974,24 @@ impl ::protobuf::Message for Goodbye { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.reason)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -1803,7 +2009,10 @@ impl ::protobuf::Message for Goodbye { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.reason.as_ref() { os.write_string(1, &v)?; } @@ -1842,19 +2051,25 @@ impl ::protobuf::Message for Goodbye { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "reason", - |m: &Goodbye| { &m.reason }, - |m: &mut Goodbye| { &mut m.reason }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "reason", + |m: &Goodbye| &m.reason, + |m: &mut Goodbye| &mut m.reason, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Goodbye", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -1862,9 +2077,7 @@ impl ::protobuf::Message for Goodbye { fn default_instance() -> &'static Goodbye { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Goodbye::new) - } + unsafe { instance.get(Goodbye::new) } } } @@ -1887,7 +2100,7 @@ impl ::protobuf::reflect::ProtobufValue for Goodbye { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct State { // message fields context_uri: ::protobuf::SingularField<::std::string::String>, @@ -1923,7 +2136,6 @@ impl State { // optional string context_uri = 2; - pub fn get_context_uri(&self) -> &str { match self.context_uri.as_ref() { Some(v) => &v, @@ -1954,12 +2166,13 @@ impl State { // Take field pub fn take_context_uri(&mut self) -> ::std::string::String { - self.context_uri.take().unwrap_or_else(|| ::std::string::String::new()) + self.context_uri + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional uint32 index = 3; - pub fn get_index(&self) -> u32 { self.index.unwrap_or(0) } @@ -1978,7 +2191,6 @@ impl State { // optional uint32 position_ms = 4; - pub fn get_position_ms(&self) -> u32 { self.position_ms.unwrap_or(0) } @@ -1997,7 +2209,6 @@ impl State { // optional .PlayStatus status = 5; - pub fn get_status(&self) -> PlayStatus { self.status.unwrap_or(PlayStatus::kPlayStatusStop) } @@ -2016,7 +2227,6 @@ impl State { // optional uint64 position_measured_at = 7; - pub fn get_position_measured_at(&self) -> u64 { self.position_measured_at.unwrap_or(0) } @@ -2035,7 +2245,6 @@ impl State { // optional string context_description = 8; - pub fn get_context_description(&self) -> &str { match self.context_description.as_ref() { Some(v) => &v, @@ -2066,12 +2275,13 @@ impl State { // Take field pub fn take_context_description(&mut self) -> ::std::string::String { - self.context_description.take().unwrap_or_else(|| ::std::string::String::new()) + self.context_description + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool shuffle = 13; - pub fn get_shuffle(&self) -> bool { self.shuffle.unwrap_or(false) } @@ -2090,7 +2300,6 @@ impl State { // optional bool repeat = 14; - pub fn get_repeat(&self) -> bool { self.repeat.unwrap_or(false) } @@ -2109,7 +2318,6 @@ impl State { // optional string last_command_ident = 20; - pub fn get_last_command_ident(&self) -> &str { match self.last_command_ident.as_ref() { Some(v) => &v, @@ -2140,12 +2348,13 @@ impl State { // Take field pub fn take_last_command_ident(&mut self) -> ::std::string::String { - self.last_command_ident.take().unwrap_or_else(|| ::std::string::String::new()) + self.last_command_ident + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional uint32 last_command_msgid = 21; - pub fn get_last_command_msgid(&self) -> u32 { self.last_command_msgid.unwrap_or(0) } @@ -2164,7 +2373,6 @@ impl State { // optional bool playing_from_fallback = 24; - pub fn get_playing_from_fallback(&self) -> bool { self.playing_from_fallback.unwrap_or(false) } @@ -2183,7 +2391,6 @@ impl State { // optional uint32 row = 25; - pub fn get_row(&self) -> u32 { self.row.unwrap_or(0) } @@ -2202,7 +2409,6 @@ impl State { // optional uint32 playing_track_index = 26; - pub fn get_playing_track_index(&self) -> u32 { self.playing_track_index.unwrap_or(0) } @@ -2221,7 +2427,6 @@ impl State { // repeated .TrackRef track = 27; - pub fn get_track(&self) -> &[TrackRef] { &self.track } @@ -2246,7 +2451,6 @@ impl State { // optional .Ad ad = 28; - pub fn get_ad(&self) -> &Ad { self.ad.as_ref().unwrap_or_else(|| Ad::default_instance()) } @@ -2284,103 +2488,145 @@ impl ::protobuf::Message for State { if !v.is_initialized() { return false; } - }; + } for v in &self.ad { if !v.is_initialized() { return false; } - }; + } true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 2 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.context_uri)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.context_uri, + )?; + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.index = ::std::option::Option::Some(tmp); - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.position_ms = ::std::option::Option::Some(tmp); - }, - 5 => { - ::protobuf::rt::read_proto2_enum_with_unknown_fields_into(wire_type, is, &mut self.status, 5, &mut self.unknown_fields)? - }, + } + 5 => ::protobuf::rt::read_proto2_enum_with_unknown_fields_into( + wire_type, + is, + &mut self.status, + 5, + &mut self.unknown_fields, + )?, 7 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint64()?; self.position_measured_at = ::std::option::Option::Some(tmp); - }, + } 8 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.context_description)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.context_description, + )?; + } 13 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.shuffle = ::std::option::Option::Some(tmp); - }, + } 14 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.repeat = ::std::option::Option::Some(tmp); - }, + } 20 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.last_command_ident)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.last_command_ident, + )?; + } 21 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.last_command_msgid = ::std::option::Option::Some(tmp); - }, + } 24 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.playing_from_fallback = ::std::option::Option::Some(tmp); - }, + } 25 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.row = ::std::option::Option::Some(tmp); - }, + } 26 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_uint32()?; self.playing_track_index = ::std::option::Option::Some(tmp); - }, + } 27 => { ::protobuf::rt::read_repeated_message_into(wire_type, is, &mut self.track)?; - }, + } 28 => { ::protobuf::rt::read_singular_message_into(wire_type, is, &mut self.ad)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2432,7 +2678,7 @@ impl ::protobuf::Message for State { for value in &self.track { let len = value.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; - }; + } if let Some(ref v) = self.ad.as_ref() { let len = v.compute_size(); my_size += 2 + ::protobuf::rt::compute_raw_varint32_size(len) + len; @@ -2442,7 +2688,10 @@ impl ::protobuf::Message for State { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.context_uri.as_ref() { os.write_string(2, &v)?; } @@ -2486,7 +2735,7 @@ impl ::protobuf::Message for State { os.write_tag(27, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; v.write_to_with_cached_sizes(os)?; - }; + } if let Some(ref v) = self.ad.as_ref() { os.write_tag(28, ::protobuf::wire_format::WireTypeLengthDelimited)?; os.write_raw_varint32(v.get_cached_size())?; @@ -2527,89 +2776,137 @@ impl ::protobuf::Message for State { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "context_uri", - |m: &State| { &m.context_uri }, - |m: &mut State| { &mut m.context_uri }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "context_uri", + |m: &State| &m.context_uri, + |m: &mut State| &mut m.context_uri, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "index", - |m: &State| { &m.index }, - |m: &mut State| { &mut m.index }, + |m: &State| &m.index, + |m: &mut State| &mut m.index, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "position_ms", - |m: &State| { &m.position_ms }, - |m: &mut State| { &mut m.position_ms }, + |m: &State| &m.position_ms, + |m: &mut State| &mut m.position_ms, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeEnum>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeEnum, + >( "status", - |m: &State| { &m.status }, - |m: &mut State| { &mut m.status }, + |m: &State| &m.status, + |m: &mut State| &mut m.status, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint64>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint64, + >( "position_measured_at", - |m: &State| { &m.position_measured_at }, - |m: &mut State| { &mut m.position_measured_at }, + |m: &State| &m.position_measured_at, + |m: &mut State| &mut m.position_measured_at, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "context_description", - |m: &State| { &m.context_description }, - |m: &mut State| { &mut m.context_description }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "context_description", + |m: &State| &m.context_description, + |m: &mut State| &mut m.context_description, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "shuffle", - |m: &State| { &m.shuffle }, - |m: &mut State| { &mut m.shuffle }, + |m: &State| &m.shuffle, + |m: &mut State| &mut m.shuffle, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "repeat", - |m: &State| { &m.repeat }, - |m: &mut State| { &mut m.repeat }, + |m: &State| &m.repeat, + |m: &mut State| &mut m.repeat, )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "last_command_ident", - |m: &State| { &m.last_command_ident }, - |m: &mut State| { &mut m.last_command_ident }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "last_command_ident", + |m: &State| &m.last_command_ident, + |m: &mut State| &mut m.last_command_ident, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "last_command_msgid", - |m: &State| { &m.last_command_msgid }, - |m: &mut State| { &mut m.last_command_msgid }, + |m: &State| &m.last_command_msgid, + |m: &mut State| &mut m.last_command_msgid, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "playing_from_fallback", - |m: &State| { &m.playing_from_fallback }, - |m: &mut State| { &mut m.playing_from_fallback }, + |m: &State| &m.playing_from_fallback, + |m: &mut State| &mut m.playing_from_fallback, )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( - "row", - |m: &State| { &m.row }, - |m: &mut State| { &mut m.row }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( + "row", |m: &State| &m.row, |m: &mut State| &mut m.row )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeUint32>( + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeUint32, + >( "playing_track_index", - |m: &State| { &m.playing_track_index }, - |m: &mut State| { &mut m.playing_track_index }, - )); - fields.push(::protobuf::reflect::accessor::make_repeated_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "track", - |m: &State| { &m.track }, - |m: &mut State| { &mut m.track }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_ptr_field_accessor::<_, ::protobuf::types::ProtobufTypeMessage>( - "ad", - |m: &State| { &m.ad }, - |m: &mut State| { &mut m.ad }, + |m: &State| &m.playing_track_index, + |m: &mut State| &mut m.playing_track_index, )); + fields.push( + ::protobuf::reflect::accessor::make_repeated_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >( + "track", |m: &State| &m.track, |m: &mut State| &mut m.track + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_ptr_field_accessor::< + _, + ::protobuf::types::ProtobufTypeMessage, + >("ad", |m: &State| &m.ad, |m: &mut State| &mut m.ad), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "State", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2617,9 +2914,7 @@ impl ::protobuf::Message for State { fn default_instance() -> &'static State { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(State::new) - } + unsafe { instance.get(State::new) } } } @@ -2656,7 +2951,7 @@ impl ::protobuf::reflect::ProtobufValue for State { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct TrackRef { // message fields gid: ::protobuf::SingularField<::std::vec::Vec>, @@ -2681,7 +2976,6 @@ impl TrackRef { // optional bytes gid = 1; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -2717,7 +3011,6 @@ impl TrackRef { // optional string uri = 2; - pub fn get_uri(&self) -> &str { match self.uri.as_ref() { Some(v) => &v, @@ -2748,12 +3041,13 @@ impl TrackRef { // Take field pub fn take_uri(&mut self) -> ::std::string::String { - self.uri.take().unwrap_or_else(|| ::std::string::String::new()) + self.uri + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bool queued = 3; - pub fn get_queued(&self) -> bool { self.queued.unwrap_or(false) } @@ -2772,7 +3066,6 @@ impl TrackRef { // optional string context = 4; - pub fn get_context(&self) -> &str { match self.context.as_ref() { Some(v) => &v, @@ -2803,7 +3096,9 @@ impl TrackRef { // Take field pub fn take_context(&mut self) -> ::std::string::String { - self.context.take().unwrap_or_else(|| ::std::string::String::new()) + self.context + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -2812,29 +3107,39 @@ impl ::protobuf::Message for TrackRef { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.uri)?; - }, + } 3 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_bool()?; self.queued = ::std::option::Option::Some(tmp); - }, + } 4 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.context)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -2861,7 +3166,10 @@ impl ::protobuf::Message for TrackRef { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.gid.as_ref() { os.write_bytes(1, &v)?; } @@ -2909,34 +3217,49 @@ impl ::protobuf::Message for TrackRef { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &TrackRef| { &m.gid }, - |m: &mut TrackRef| { &mut m.gid }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "uri", - |m: &TrackRef| { &m.uri }, - |m: &mut TrackRef| { &mut m.uri }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeBool>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "gid", |m: &TrackRef| &m.gid, |m: &mut TrackRef| &mut m.gid + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "uri", |m: &TrackRef| &m.uri, |m: &mut TrackRef| &mut m.uri + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeBool, + >( "queued", - |m: &TrackRef| { &m.queued }, - |m: &mut TrackRef| { &mut m.queued }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "context", - |m: &TrackRef| { &m.context }, - |m: &mut TrackRef| { &mut m.context }, + |m: &TrackRef| &m.queued, + |m: &mut TrackRef| &mut m.queued, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "context", + |m: &TrackRef| &m.context, + |m: &mut TrackRef| &mut m.context, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "TrackRef", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -2944,9 +3267,7 @@ impl ::protobuf::Message for TrackRef { fn default_instance() -> &'static TrackRef { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(TrackRef::new) - } + unsafe { instance.get(TrackRef::new) } } } @@ -2972,7 +3293,7 @@ impl ::protobuf::reflect::ProtobufValue for TrackRef { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Ad { // message fields next: ::std::option::Option, @@ -3002,7 +3323,6 @@ impl Ad { // optional int32 next = 1; - pub fn get_next(&self) -> i32 { self.next.unwrap_or(0) } @@ -3021,7 +3341,6 @@ impl Ad { // optional bytes ogg_fid = 2; - pub fn get_ogg_fid(&self) -> &[u8] { match self.ogg_fid.as_ref() { Some(v) => &v, @@ -3052,12 +3371,13 @@ impl Ad { // Take field pub fn take_ogg_fid(&mut self) -> ::std::vec::Vec { - self.ogg_fid.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.ogg_fid + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional bytes image_fid = 3; - pub fn get_image_fid(&self) -> &[u8] { match self.image_fid.as_ref() { Some(v) => &v, @@ -3088,12 +3408,13 @@ impl Ad { // Take field pub fn take_image_fid(&mut self) -> ::std::vec::Vec { - self.image_fid.take().unwrap_or_else(|| ::std::vec::Vec::new()) + self.image_fid + .take() + .unwrap_or_else(|| ::std::vec::Vec::new()) } // optional int32 duration = 4; - pub fn get_duration(&self) -> i32 { self.duration.unwrap_or(0) } @@ -3112,7 +3433,6 @@ impl Ad { // optional string click_url = 5; - pub fn get_click_url(&self) -> &str { match self.click_url.as_ref() { Some(v) => &v, @@ -3143,12 +3463,13 @@ impl Ad { // Take field pub fn take_click_url(&mut self) -> ::std::string::String { - self.click_url.take().unwrap_or_else(|| ::std::string::String::new()) + self.click_url + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string impression_url = 6; - pub fn get_impression_url(&self) -> &str { match self.impression_url.as_ref() { Some(v) => &v, @@ -3179,12 +3500,13 @@ impl Ad { // Take field pub fn take_impression_url(&mut self) -> ::std::string::String { - self.impression_url.take().unwrap_or_else(|| ::std::string::String::new()) + self.impression_url + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string product = 7; - pub fn get_product(&self) -> &str { match self.product.as_ref() { Some(v) => &v, @@ -3215,12 +3537,13 @@ impl Ad { // Take field pub fn take_product(&mut self) -> ::std::string::String { - self.product.take().unwrap_or_else(|| ::std::string::String::new()) + self.product + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string advertiser = 8; - pub fn get_advertiser(&self) -> &str { match self.advertiser.as_ref() { Some(v) => &v, @@ -3251,12 +3574,13 @@ impl Ad { // Take field pub fn take_advertiser(&mut self) -> ::std::string::String { - self.advertiser.take().unwrap_or_else(|| ::std::string::String::new()) + self.advertiser + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional bytes gid = 9; - pub fn get_gid(&self) -> &[u8] { match self.gid.as_ref() { Some(v) => &v, @@ -3296,48 +3620,64 @@ impl ::protobuf::Message for Ad { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.next = ::std::option::Option::Some(tmp); - }, + } 2 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.ogg_fid)?; - }, + } 3 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.image_fid)?; - }, + } 4 => { if wire_type != ::protobuf::wire_format::WireTypeVarint { - return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type(wire_type)); + return ::std::result::Result::Err(::protobuf::rt::unexpected_wire_type( + wire_type, + )); } let tmp = is.read_int32()?; self.duration = ::std::option::Option::Some(tmp); - }, + } 5 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.click_url)?; - }, + } 6 => { - ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.impression_url)?; - }, + ::protobuf::rt::read_singular_string_into( + wire_type, + is, + &mut self.impression_url, + )?; + } 7 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.product)?; - }, + } 8 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.advertiser)?; - }, + } 9 => { ::protobuf::rt::read_singular_bytes_into(wire_type, is, &mut self.gid)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3379,7 +3719,10 @@ impl ::protobuf::Message for Ad { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(v) = self.next { os.write_int32(1, v)?; } @@ -3442,59 +3785,91 @@ impl ::protobuf::Message for Ad { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( - "next", - |m: &Ad| { &m.next }, - |m: &mut Ad| { &mut m.next }, + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( + "next", |m: &Ad| &m.next, |m: &mut Ad| &mut m.next )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "ogg_fid", - |m: &Ad| { &m.ogg_fid }, - |m: &mut Ad| { &mut m.ogg_fid }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "image_fid", - |m: &Ad| { &m.image_fid }, - |m: &mut Ad| { &mut m.image_fid }, - )); - fields.push(::protobuf::reflect::accessor::make_option_accessor::<_, ::protobuf::types::ProtobufTypeInt32>( + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "ogg_fid", |m: &Ad| &m.ogg_fid, |m: &mut Ad| &mut m.ogg_fid + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >( + "image_fid", + |m: &Ad| &m.image_fid, + |m: &mut Ad| &mut m.image_fid, + ), + ); + fields.push(::protobuf::reflect::accessor::make_option_accessor::< + _, + ::protobuf::types::ProtobufTypeInt32, + >( "duration", - |m: &Ad| { &m.duration }, - |m: &mut Ad| { &mut m.duration }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "click_url", - |m: &Ad| { &m.click_url }, - |m: &mut Ad| { &mut m.click_url }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "impression_url", - |m: &Ad| { &m.impression_url }, - |m: &mut Ad| { &mut m.impression_url }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "product", - |m: &Ad| { &m.product }, - |m: &mut Ad| { &mut m.product }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "advertiser", - |m: &Ad| { &m.advertiser }, - |m: &mut Ad| { &mut m.advertiser }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeBytes>( - "gid", - |m: &Ad| { &m.gid }, - |m: &mut Ad| { &mut m.gid }, + |m: &Ad| &m.duration, + |m: &mut Ad| &mut m.duration, )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "click_url", + |m: &Ad| &m.click_url, + |m: &mut Ad| &mut m.click_url, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "impression_url", + |m: &Ad| &m.impression_url, + |m: &mut Ad| &mut m.impression_url, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "product", |m: &Ad| &m.product, |m: &mut Ad| &mut m.product + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "advertiser", + |m: &Ad| &m.advertiser, + |m: &mut Ad| &mut m.advertiser, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeBytes, + >("gid", |m: &Ad| &m.gid, |m: &mut Ad| &mut m.gid), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Ad", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3502,9 +3877,7 @@ impl ::protobuf::Message for Ad { fn default_instance() -> &'static Ad { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Ad::new) - } + unsafe { instance.get(Ad::new) } } } @@ -3535,7 +3908,7 @@ impl ::protobuf::reflect::ProtobufValue for Ad { } } -#[derive(PartialEq,Clone,Default)] +#[derive(PartialEq, Clone, Default)] pub struct Metadata { // message fields field_type: ::protobuf::SingularField<::std::string::String>, @@ -3558,7 +3931,6 @@ impl Metadata { // optional string type = 1; - pub fn get_field_type(&self) -> &str { match self.field_type.as_ref() { Some(v) => &v, @@ -3589,12 +3961,13 @@ impl Metadata { // Take field pub fn take_field_type(&mut self) -> ::std::string::String { - self.field_type.take().unwrap_or_else(|| ::std::string::String::new()) + self.field_type + .take() + .unwrap_or_else(|| ::std::string::String::new()) } // optional string metadata = 2; - pub fn get_metadata(&self) -> &str { match self.metadata.as_ref() { Some(v) => &v, @@ -3625,7 +3998,9 @@ impl Metadata { // Take field pub fn take_metadata(&mut self) -> ::std::string::String { - self.metadata.take().unwrap_or_else(|| ::std::string::String::new()) + self.metadata + .take() + .unwrap_or_else(|| ::std::string::String::new()) } } @@ -3634,19 +4009,27 @@ impl ::protobuf::Message for Metadata { true } - fn merge_from(&mut self, is: &mut ::protobuf::CodedInputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn merge_from( + &mut self, + is: &mut ::protobuf::CodedInputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { while !is.eof()? { let (field_number, wire_type) = is.read_tag_unpack()?; match field_number { 1 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.field_type)?; - }, + } 2 => { ::protobuf::rt::read_singular_string_into(wire_type, is, &mut self.metadata)?; - }, + } _ => { - ::protobuf::rt::read_unknown_or_skip_group(field_number, wire_type, is, self.mut_unknown_fields())?; - }, + ::protobuf::rt::read_unknown_or_skip_group( + field_number, + wire_type, + is, + self.mut_unknown_fields(), + )?; + } }; } ::std::result::Result::Ok(()) @@ -3667,7 +4050,10 @@ impl ::protobuf::Message for Metadata { my_size } - fn write_to_with_cached_sizes(&self, os: &mut ::protobuf::CodedOutputStream<'_>) -> ::protobuf::ProtobufResult<()> { + fn write_to_with_cached_sizes( + &self, + os: &mut ::protobuf::CodedOutputStream<'_>, + ) -> ::protobuf::ProtobufResult<()> { if let Some(ref v) = self.field_type.as_ref() { os.write_string(1, &v)?; } @@ -3709,24 +4095,35 @@ impl ::protobuf::Message for Metadata { } fn descriptor_static() -> &'static ::protobuf::reflect::MessageDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::MessageDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { let mut fields = ::std::vec::Vec::new(); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "type", - |m: &Metadata| { &m.field_type }, - |m: &mut Metadata| { &mut m.field_type }, - )); - fields.push(::protobuf::reflect::accessor::make_singular_field_accessor::<_, ::protobuf::types::ProtobufTypeString>( - "metadata", - |m: &Metadata| { &m.metadata }, - |m: &mut Metadata| { &mut m.metadata }, - )); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "type", + |m: &Metadata| &m.field_type, + |m: &mut Metadata| &mut m.field_type, + ), + ); + fields.push( + ::protobuf::reflect::accessor::make_singular_field_accessor::< + _, + ::protobuf::types::ProtobufTypeString, + >( + "metadata", + |m: &Metadata| &m.metadata, + |m: &mut Metadata| &mut m.metadata, + ), + ); ::protobuf::reflect::MessageDescriptor::new_pb_name::( "Metadata", fields, - file_descriptor_proto() + file_descriptor_proto(), ) }) } @@ -3734,9 +4131,7 @@ impl ::protobuf::Message for Metadata { fn default_instance() -> &'static Metadata { static mut instance: ::protobuf::lazy::Lazy = ::protobuf::lazy::Lazy::INIT; - unsafe { - instance.get(Metadata::new) - } + unsafe { instance.get(Metadata::new) } } } @@ -3760,7 +4155,7 @@ impl ::protobuf::reflect::ProtobufValue for Metadata { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum MessageType { kMessageTypeHello = 1, kMessageTypeGoodbye = 2, @@ -3813,7 +4208,7 @@ impl ::protobuf::ProtobufEnum for MessageType { 35 => ::std::option::Option::Some(MessageType::kMessageTypeAction), 36 => ::std::option::Option::Some(MessageType::kMessageTypeRename), 128 => ::std::option::Option::Some(MessageType::kMessageTypeUpdateMetadata), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -3845,17 +4240,20 @@ impl ::protobuf::ProtobufEnum for MessageType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("MessageType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "MessageType", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for MessageType { -} +impl ::std::marker::Copy for MessageType {} // Note, `Default` is implemented although default value is not 0 impl ::std::default::Default for MessageType { @@ -3870,7 +4268,7 @@ impl ::protobuf::reflect::ProtobufValue for MessageType { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum CapabilityType { kSupportedContexts = 1, kCanBePlayer = 2, @@ -3909,7 +4307,7 @@ impl ::protobuf::ProtobufEnum for CapabilityType { 12 => ::std::option::Option::Some(CapabilityType::kHidden), 13 => ::std::option::Option::Some(CapabilityType::kSupportsPlaylistV2), 14 => ::std::option::Option::Some(CapabilityType::kSupportsExternalEpisodes), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -3934,17 +4332,20 @@ impl ::protobuf::ProtobufEnum for CapabilityType { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("CapabilityType", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "CapabilityType", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for CapabilityType { -} +impl ::std::marker::Copy for CapabilityType {} // Note, `Default` is implemented although default value is not 0 impl ::std::default::Default for CapabilityType { @@ -3959,7 +4360,7 @@ impl ::protobuf::reflect::ProtobufValue for CapabilityType { } } -#[derive(Clone,PartialEq,Eq,Debug,Hash)] +#[derive(Clone, PartialEq, Eq, Debug, Hash)] pub enum PlayStatus { kPlayStatusStop = 0, kPlayStatusPlay = 1, @@ -3978,7 +4379,7 @@ impl ::protobuf::ProtobufEnum for PlayStatus { 1 => ::std::option::Option::Some(PlayStatus::kPlayStatusPlay), 2 => ::std::option::Option::Some(PlayStatus::kPlayStatusPause), 3 => ::std::option::Option::Some(PlayStatus::kPlayStatusLoading), - _ => ::std::option::Option::None + _ => ::std::option::Option::None, } } @@ -3993,17 +4394,20 @@ impl ::protobuf::ProtobufEnum for PlayStatus { } fn enum_descriptor_static() -> &'static ::protobuf::reflect::EnumDescriptor { - static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = ::protobuf::lazy::Lazy::INIT; + static mut descriptor: ::protobuf::lazy::Lazy<::protobuf::reflect::EnumDescriptor> = + ::protobuf::lazy::Lazy::INIT; unsafe { descriptor.get(|| { - ::protobuf::reflect::EnumDescriptor::new_pb_name::("PlayStatus", file_descriptor_proto()) + ::protobuf::reflect::EnumDescriptor::new_pb_name::( + "PlayStatus", + file_descriptor_proto(), + ) }) } } } -impl ::std::marker::Copy for PlayStatus { -} +impl ::std::marker::Copy for PlayStatus {} impl ::std::default::Default for PlayStatus { fn default() -> Self { @@ -4086,16 +4490,14 @@ static file_descriptor_proto_data: &'static [u8] = b"\ se\x10\x02\x12\x16\n\x12kPlayStatusLoading\x10\x03\x1a\0B\0b\x06proto2\ "; -static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy<::protobuf::descriptor::FileDescriptorProto> = ::protobuf::lazy::Lazy::INIT; +static mut file_descriptor_proto_lazy: ::protobuf::lazy::Lazy< + ::protobuf::descriptor::FileDescriptorProto, +> = ::protobuf::lazy::Lazy::INIT; fn parse_descriptor_proto() -> ::protobuf::descriptor::FileDescriptorProto { ::protobuf::parse_from_bytes(file_descriptor_proto_data).unwrap() } pub fn file_descriptor_proto() -> &'static ::protobuf::descriptor::FileDescriptorProto { - unsafe { - file_descriptor_proto_lazy.get(|| { - parse_descriptor_proto() - }) - } + unsafe { file_descriptor_proto_lazy.get(|| parse_descriptor_proto()) } } From 68949da7c2ac1010a69cba91d9e2205323cb3f85 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Wed, 22 Jul 2020 16:53:52 +0100 Subject: [PATCH 24/26] Update version numbers to 0.1.2 --- Cargo.toml | 14 +++++++------- audio/Cargo.toml | 4 ++-- connect/Cargo.toml | 8 ++++---- core/Cargo.toml | 4 ++-- metadata/Cargo.toml | 6 +++--- playback/Cargo.toml | 8 ++++---- protocol/Cargo.toml | 2 +- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index ab03332d..518f476e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot" -version = "0.1.1" +version = "0.1.2" authors = ["Librespot Org"] license = "MIT" description = "An open source client library for Spotify, with support for Spotify Connect" @@ -22,22 +22,22 @@ doc = false [dependencies.librespot-audio] path = "audio" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-connect] path = "connect" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-core] path = "core" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-metadata] path = "metadata" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-playback] path = "playback" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-protocol] path = "protocol" -version = "0.1.1" +version = "0.1.2" [dependencies] base64 = "0.10" diff --git a/audio/Cargo.toml b/audio/Cargo.toml index c666ee78..871e3eae 100644 --- a/audio/Cargo.toml +++ b/audio/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot-audio" -version = "0.1.1" +version = "0.1.2" authors = ["Paul Lietar "] description="The audio fetching and processing logic for librespot" license="MIT" @@ -8,7 +8,7 @@ edition = "2018" [dependencies.librespot-core] path = "../core" -version = "0.1.1" +version = "0.1.2" [dependencies] bit-set = "0.5" diff --git a/connect/Cargo.toml b/connect/Cargo.toml index 8be8ec6d..d9df0758 100644 --- a/connect/Cargo.toml +++ b/connect/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot-connect" -version = "0.1.1" +version = "0.1.2" authors = ["Paul Lietar "] description="The discovery and Spotify Connect logic for librespot" license="MIT" @@ -8,13 +8,13 @@ edition = "2018" [dependencies.librespot-core] path = "../core" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-playback] path = "../playback" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-protocol] path = "../protocol" -version = "0.1.1" +version = "0.1.2" [dependencies] base64 = "0.10" diff --git a/core/Cargo.toml b/core/Cargo.toml index ac3418cc..a9a2639e 100644 --- a/core/Cargo.toml +++ b/core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot-core" -version = "0.1.1" +version = "0.1.2" authors = ["Paul Lietar "] build = "build.rs" description="The core functionality provided by librespot" @@ -9,7 +9,7 @@ edition = "2018" [dependencies.librespot-protocol] path = "../protocol" -version = "0.1.1" +version = "0.1.2" [dependencies] base64 = "0.10" diff --git a/metadata/Cargo.toml b/metadata/Cargo.toml index 40ebe4b8..3c656055 100644 --- a/metadata/Cargo.toml +++ b/metadata/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot-metadata" -version = "0.1.1" +version = "0.1.2" authors = ["Paul Lietar "] description="The metadata logic for librespot" license="MIT" @@ -15,7 +15,7 @@ log = "0.4" [dependencies.librespot-core] path = "../core" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-protocol] path = "../protocol" -version = "0.1.1" +version = "0.1.2" diff --git a/playback/Cargo.toml b/playback/Cargo.toml index c0986c4a..fc251a84 100644 --- a/playback/Cargo.toml +++ b/playback/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot-playback" -version = "0.1.1" +version = "0.1.2" authors = ["Sasha Hilton "] description="The audio playback logic for librespot" license="MIT" @@ -8,13 +8,13 @@ edition = "2018" [dependencies.librespot-audio] path = "../audio" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-core] path = "../core" -version = "0.1.1" +version = "0.1.2" [dependencies.librespot-metadata] path = "../metadata" -version = "0.1.1" +version = "0.1.2" [dependencies] futures = "0.1" diff --git a/protocol/Cargo.toml b/protocol/Cargo.toml index 683f8dae..32480716 100644 --- a/protocol/Cargo.toml +++ b/protocol/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "librespot-protocol" -version = "0.1.1" +version = "0.1.2" authors = ["Paul Liétar "] build = "build.rs" description="The protobuf logic for communicating with Spotify servers" From e1c33422a143e70cf934cbe321265acd3323f7b3 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Wed, 22 Jul 2020 17:10:30 +0100 Subject: [PATCH 25/26] Update Cargo.lock & Add notes on todo in publish.sh --- Cargo.lock | 46 +++++++++++++++++++++++----------------------- publish.sh | 3 ++- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 54eb3789..dabd9657 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -744,7 +744,7 @@ dependencies = [ [[package]] name = "librespot" -version = "0.1.1" +version = "0.1.2" dependencies = [ "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", "env_logger 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -752,12 +752,12 @@ dependencies = [ "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", - "librespot-audio 0.1.1", - "librespot-connect 0.1.1", - "librespot-core 0.1.1", - "librespot-metadata 0.1.1", - "librespot-playback 0.1.1", - "librespot-protocol 0.1.1", + "librespot-audio 0.1.2", + "librespot-connect 0.1.2", + "librespot-core 0.1.2", + "librespot-metadata 0.1.2", + "librespot-playback 0.1.2", + "librespot-protocol 0.1.2", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -773,7 +773,7 @@ dependencies = [ [[package]] name = "librespot-audio" -version = "0.1.1" +version = "0.1.2" dependencies = [ "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "bit-set 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -781,7 +781,7 @@ dependencies = [ "bytes 0.4.12 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", "lewton 0.9.4 (registry+https://github.com/rust-lang/crates.io-index)", - "librespot-core 0.1.1", + "librespot-core 0.1.2", "librespot-tremor 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -792,7 +792,7 @@ dependencies = [ [[package]] name = "librespot-connect" -version = "0.1.1" +version = "0.1.2" dependencies = [ "aes-ctr 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -802,9 +802,9 @@ dependencies = [ "hmac 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "libmdns 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", - "librespot-core 0.1.1", - "librespot-playback 0.1.1", - "librespot-protocol 0.1.1", + "librespot-core 0.1.2", + "librespot-playback 0.1.2", + "librespot-protocol 0.1.2", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -819,7 +819,7 @@ dependencies = [ [[package]] name = "librespot-core" -version = "0.1.1" +version = "0.1.2" dependencies = [ "aes 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "base64 0.10.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -832,7 +832,7 @@ dependencies = [ "hyper 0.11.27 (registry+https://github.com/rust-lang/crates.io-index)", "hyper-proxy 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)", "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "librespot-protocol 0.1.1", + "librespot-protocol 0.1.2", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "num-bigint 0.2.6 (registry+https://github.com/rust-lang/crates.io-index)", "num-integer 0.1.43 (registry+https://github.com/rust-lang/crates.io-index)", @@ -855,12 +855,12 @@ dependencies = [ [[package]] name = "librespot-metadata" -version = "0.1.1" +version = "0.1.2" dependencies = [ "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", "futures 0.1.29 (registry+https://github.com/rust-lang/crates.io-index)", - "librespot-core 0.1.1", - "librespot-protocol 0.1.1", + "librespot-core 0.1.2", + "librespot-protocol 0.1.2", "linear-map 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -868,7 +868,7 @@ dependencies = [ [[package]] name = "librespot-playback" -version = "0.1.1" +version = "0.1.2" dependencies = [ "alsa 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -877,9 +877,9 @@ dependencies = [ "jack 0.5.7 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.73 (registry+https://github.com/rust-lang/crates.io-index)", "libpulse-sys 0.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "librespot-audio 0.1.1", - "librespot-core 0.1.1", - "librespot-metadata 0.1.1", + "librespot-audio 0.1.2", + "librespot-core 0.1.2", + "librespot-metadata 0.1.2", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "portaudio-rs 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "rodio 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -889,7 +889,7 @@ dependencies = [ [[package]] name = "librespot-protocol" -version = "0.1.1" +version = "0.1.2" dependencies = [ "protobuf 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", "protobuf-codegen 2.14.0 (registry+https://github.com/rust-lang/crates.io-index)", diff --git a/publish.sh b/publish.sh index a7d1076a..b280fcda 100755 --- a/publish.sh +++ b/publish.sh @@ -47,7 +47,7 @@ function publishCrates { crate_path="$WORKINGDIR/$CRATE" crate_path=${crate_path//\/\///} cd $crate_path - + # Also need to update Cargo.lock in root directory crate_name=`echo $( awk -v FS="name = " 'NF>1{print $2; exit}' Cargo.toml )` echo "Publishing $crate_name to crates.io" if [ "$CRATE" == "protocol" ] @@ -58,6 +58,7 @@ function publishCrates { cargo publish fi echo "Successfully published $crate_name to crates.io" + # Should sleep here for 30 seconds to allow Crates.io time to push updated package to edge servers. done } From 6aac8a6912b2cfa1eeb936666a7f6da2272f3e88 Mon Sep 17 00:00:00 2001 From: Sasha Hilton Date: Fri, 24 Jul 2020 04:00:42 +0100 Subject: [PATCH 26/26] [ci skip] Update COMPILING.md --- COMPILING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/COMPILING.md b/COMPILING.md index 46b8e19b..91d5fafd 100644 --- a/COMPILING.md +++ b/COMPILING.md @@ -13,7 +13,7 @@ curl https://sh.rustup.rs -sSf | sh Follow any prompts it gives you to install Rust. Once that’s done, Rust's standard tools should be setup and ready to use. -*Note: The current minimum required Rust version is 1.33.0* +*Note: The current minimum required Rust version at the time of writing is 1.40.0, you can find the current minimum version specified in the `.travis.yml` file.* #### Additional Rust tools - `rustfmt` To ensure a consistent codebase, we utilise [`rustfmt`](https://github.com/rust-lang/rustfmt), which is installed by default with `rustup` these days, else it can be installed manually with: