From d632c3f90eafb246f15e17f28ffe6a019a9864f3 Mon Sep 17 00:00:00 2001 From: giangndm <45644921+giangndm@users.noreply.github.com> Date: Thu, 25 Jul 2024 02:57:34 +0700 Subject: [PATCH] deps: cargo update and some libs (#381) * deps: cargo update * deps: update some libs * fix clippys --- Cargo.lock | 126 ++++++++++-------- Cargo.toml | 4 +- packages/media_gateway/src/store.rs | 6 +- packages/media_gateway/src/store/service.rs | 2 +- packages/protocol/Cargo.toml | 2 +- .../src/protobuf/cluster_connector.rs | 20 +-- .../protocol/src/protobuf/cluster_gateway.rs | 20 +-- .../protocol/src/protobuf/features.mixer.rs | 10 +- packages/protocol/src/protobuf/features.rs | 4 +- packages/protocol/src/protobuf/gateway.rs | 2 +- packages/protocol/src/protobuf/session.rs | 60 ++++----- packages/protocol/src/protobuf/shared.rs | 10 +- 12 files changed, 141 insertions(+), 125 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02d870c6..cc75a29f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -442,7 +442,7 @@ dependencies = [ "rand 0.8.5", "rcgen", "rust-embed", - "rustls 0.23.11", + "rustls 0.23.12", "sans-io-runtime", "serde", "sysinfo", @@ -496,7 +496,7 @@ dependencies = [ "convert-enum", "derivative", "log", - "mockall", + "mockall 0.12.1", "num", "num_enum", "parking_lot", @@ -518,7 +518,7 @@ dependencies = [ "atm0s-sdn-identity", "atm0s-sdn-utils", "log", - "mockall", + "mockall 0.12.1", "serde", ] @@ -957,9 +957,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.9" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64acc1846d54c1fe936a78dc189c34e28d3f5afc348403f28ecf53660b9b8462" +checksum = "8f6b81fb3c84f5563d509c59b5a48d935f689e993afa90fe39047f05adef9142" dependencies = [ "clap_builder", "clap_derive", @@ -967,9 +967,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.9" +version = "4.5.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6fb8393d67ba2e7bfaf28a23458e4e2b543cc73a99595511eb207fdb8aede942" +checksum = "5ca6706fd5224857d9ac5eb9355f6683563cc0541c7cd9d014043b57cbec78ac" dependencies = [ "anstream", "anstyle", @@ -2286,7 +2286,7 @@ dependencies = [ "http 1.1.0", "hyper", "hyper-util", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "tokio", "tokio-rustls", @@ -2544,9 +2544,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130" [[package]] name = "jobserver" -version = "0.1.31" +version = "0.1.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0" dependencies = [ "libc", ] @@ -2906,7 +2906,7 @@ dependencies = [ "log", "media-server-protocol", "media-server-utils", - "mockall", + "mockall 0.13.0", "num_enum", "sans-io-runtime", "smallmap", @@ -3053,13 +3053,14 @@ dependencies = [ [[package]] name = "mio" -version = "0.8.11" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c" +checksum = "4569e456d394deccd22ce1c1913e6ea0e54519f577285001215d33557431afe4" dependencies = [ + "hermit-abi 0.3.9", "libc", "wasi 0.11.0+wasi-snapshot-preview1", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] @@ -3078,7 +3079,21 @@ dependencies = [ "downcast", "fragile", "lazy_static", - "mockall_derive", + "mockall_derive 0.12.1", + "predicates", + "predicates-tree", +] + +[[package]] +name = "mockall" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4c28b3fb6d753d28c20e826cd46ee611fda1cf3cde03a443a974043247c065a" +dependencies = [ + "cfg-if", + "downcast", + "fragile", + "mockall_derive 0.13.0", "predicates", "predicates-tree", ] @@ -3095,6 +3110,18 @@ dependencies = [ "syn 2.0.72", ] +[[package]] +name = "mockall_derive" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "341014e7f530314e9a1fdbc7400b244efea7122662c96bfa248c31da5bfb2020" +dependencies = [ + "cfg-if", + "proc-macro2", + "quote", + "syn 2.0.72", +] + [[package]] name = "multer" version = "3.1.0" @@ -3352,16 +3379,6 @@ dependencies = [ "libm", ] -[[package]] -name = "num_cpus" -version = "1.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" -dependencies = [ - "hermit-abi 0.3.9", - "libc", -] - [[package]] name = "num_enum" version = "0.7.2" @@ -3385,9 +3402,9 @@ dependencies = [ [[package]] name = "object" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "081b846d1d56ddfc18fdf1a922e4f6e07a11768ea1b92dec44e42b72712ccfce" +checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e" dependencies = [ "memchr", ] @@ -4018,9 +4035,9 @@ dependencies = [ [[package]] name = "prost" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29" +checksum = "e13db3d3fde688c61e2446b4d843bc27a7e8af269a69440c0308021dc92333cc" dependencies = [ "bytes 1.6.1", "prost-derive", @@ -4028,9 +4045,9 @@ dependencies = [ [[package]] name = "prost-build" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22505a5c94da8e3b7c2996394d1c933236c4d743e81a410bcca4e6989fc066a4" +checksum = "5bb182580f71dd070f88d01ce3de9f4da5021db7115d2e1c3605a754153b77c1" dependencies = [ "bytes 1.6.1", "heck 0.5.0", @@ -4049,9 +4066,9 @@ dependencies = [ [[package]] name = "prost-derive" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1" +checksum = "18bec9b0adc4eba778b33684b7ba3e7137789434769ee3ce3930463ef904cfca" dependencies = [ "anyhow", "itertools", @@ -4062,9 +4079,9 @@ dependencies = [ [[package]] name = "prost-types" -version = "0.12.6" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9091c90b0a32608e984ff2fa4091273cbdd755d54935c51d520887f4a1dbd5b0" +checksum = "cee5168b05f49d4b0ca581206eb14a7b22fafd963efe729ac48eb03266e25cc2" dependencies = [ "prost", ] @@ -4129,7 +4146,7 @@ dependencies = [ "quinn-proto", "quinn-udp", "rustc-hash", - "rustls 0.23.11", + "rustls 0.23.12", "thiserror", "tokio", "tracing", @@ -4145,7 +4162,7 @@ dependencies = [ "rand 0.8.5", "ring", "rustc-hash", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-platform-verifier", "slab", "thiserror", @@ -4155,9 +4172,9 @@ dependencies = [ [[package]] name = "quinn-udp" -version = "0.5.2" +version = "0.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9096629c45860fc7fb143e125eb826b5e721e10be3263160c7d60ca832cf8c46" +checksum = "8bffec3605b73c6f1754535084a85229fa8a30f86014e6c81aeec4abb68b0285" dependencies = [ "libc", "once_cell", @@ -4626,16 +4643,16 @@ dependencies = [ [[package]] name = "rustls" -version = "0.23.11" +version = "0.23.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4828ea528154ae444e5a642dbb7d5623354030dc9822b83fd9bb79683c7399d0" +checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" dependencies = [ "aws-lc-rs", "log", "once_cell", "ring", "rustls-pki-types", - "rustls-webpki 0.102.5", + "rustls-webpki 0.102.6", "subtle", "zeroize", ] @@ -4689,10 +4706,10 @@ dependencies = [ "jni", "log", "once_cell", - "rustls 0.23.11", + "rustls 0.23.12", "rustls-native-certs", "rustls-platform-verifier-android", - "rustls-webpki 0.102.5", + "rustls-webpki 0.102.6", "security-framework", "security-framework-sys", "webpki-roots 0.26.3", @@ -4717,9 +4734,9 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.102.5" +version = "0.102.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f9a6fccd794a42c2c105b513a2f62bc3fd8f3ba57a4593677ceb0bd035164d78" +checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" dependencies = [ "aws-lc-rs", "ring", @@ -5633,9 +5650,9 @@ checksum = "213701ba3370744dcd1a12960caa4843b3d68b4d1c0a5d575e0d65b2ee9d16c0" [[package]] name = "str0m" -version = "0.6.0" +version = "0.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e087cdda4c753989f13cbbfa16fce96a7c7d0ab1a8b349ca91980d7bea736e04" +checksum = "920d144532b39e5937a4ac21a6b380be2f2696a723a287ad7cabb0e9ffb3f1f0" dependencies = [ "combine", "crc", @@ -5957,28 +5974,27 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.38.1" +version = "1.39.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb2caba9f80616f438e09748d5acda951967e1ea58508ef53d9c6402485a46df" +checksum = "d040ac2b29ab03b09d4129c2f5bbd012a3ac2f79d38ff506a4bf8dd34b0eac8a" dependencies = [ "backtrace", "bytes 1.6.1", "libc", "mio", - "num_cpus", "parking_lot", "pin-project-lite", "signal-hook-registry", "socket2 0.5.7", "tokio-macros", - "windows-sys 0.48.0", + "windows-sys 0.52.0", ] [[package]] name = "tokio-macros" -version = "2.3.0" +version = "2.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" +checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", @@ -6001,7 +6017,7 @@ version = "0.26.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4" dependencies = [ - "rustls 0.23.11", + "rustls 0.23.12", "rustls-pki-types", "tokio", ] diff --git a/Cargo.toml b/Cargo.toml index 571bd847..ee41b071 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -23,6 +23,6 @@ smallmap = "1.4" derivative = "2.2" derive_more = "0.99" rand = "0.8" -mockall = "0.12" -prost = "0.12" +mockall = "0.13" +prost = "0.13" indexmap = "2.2" diff --git a/packages/media_gateway/src/store.rs b/packages/media_gateway/src/store.rs index 3d71a968..f5ab31d2 100644 --- a/packages/media_gateway/src/store.rs +++ b/packages/media_gateway/src/store.rs @@ -30,7 +30,7 @@ impl GatewayStore { pub fn new(zone: u32, location: Location, max_cpu: u8, max_memory: u8, max_disk: u8) -> Self { Self { node: NodeMetrics::default(), - webrtc: ServiceStore::new(ServiceKind::Webrtc, location.clone()), + webrtc: ServiceStore::new(ServiceKind::Webrtc, location), zone, location, output: None, @@ -53,7 +53,7 @@ impl GatewayStore { disk: self.node.disk, origin: Origin::Gateway(GatewayOrigin { zone: self.zone, - location: Some(self.location.clone()), + location: Some(self.location), }), webrtc: self.webrtc.local_stats(), }; @@ -89,7 +89,7 @@ impl GatewayStore { pub fn best_for(&self, kind: ServiceKind, location: Option) -> Option { let node = match kind { - ServiceKind::Webrtc => self.webrtc.best_for(location.clone()), + ServiceKind::Webrtc => self.webrtc.best_for(location), }; log::debug!("[GatewayStore] query best {:?} for {:?} got {:?}", kind, location, node); node diff --git a/packages/media_gateway/src/store/service.rs b/packages/media_gateway/src/store/service.rs index 015bd07f..65eef727 100644 --- a/packages/media_gateway/src/store/service.rs +++ b/packages/media_gateway/src/store/service.rs @@ -137,7 +137,7 @@ impl ServiceStore { } pub fn best_for(&self, location: Option) -> Option { - let location = location.unwrap_or_else(|| self.location.clone()); + let location = location.unwrap_or(self.location); let mut min_dis = distance(&self.location, &location); let mut min_node = self.local_sources.first().map(|s| s.node); diff --git a/packages/protocol/Cargo.toml b/packages/protocol/Cargo.toml index 1d21cd76..474b6671 100644 --- a/packages/protocol/Cargo.toml +++ b/packages/protocol/Cargo.toml @@ -18,7 +18,7 @@ quinn = { version = "0.11", optional = true } tokio = { version = "1", features = ["rt"] } [build-dependencies] -prost-build = "0.12" +prost-build = "0.13" tera = "1" serde = { version = "1.0.200", features = ["derive"] } diff --git a/packages/protocol/src/protobuf/cluster_connector.rs b/packages/protocol/src/protobuf/cluster_connector.rs index c94e8fde..5e03c871 100644 --- a/packages/protocol/src/protobuf/cluster_connector.rs +++ b/packages/protocol/src/protobuf/cluster_connector.rs @@ -71,7 +71,7 @@ pub mod peer_event { } #[derive(serde::Serialize)] #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RouteSuccess { #[prost(uint32, tag = "1")] pub after_ms: u32, @@ -80,7 +80,7 @@ pub mod peer_event { } #[derive(serde::Serialize)] #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RouteError { #[prost(uint32, tag = "1")] pub after_ms: u32, @@ -143,7 +143,7 @@ pub mod peer_event { } #[derive(serde::Serialize)] #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ConnectError { #[prost(uint32, tag = "1")] pub after_ms: u32, @@ -217,7 +217,7 @@ pub mod peer_event { pub remote_ip: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Stats { #[prost(uint64, tag = "1")] pub sent_bytes: u64, @@ -242,7 +242,7 @@ pub mod peer_event { } #[derive(serde::Serialize)] #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Disconnected { #[prost(uint32, tag = "1")] pub duration_ms: u32, @@ -314,7 +314,7 @@ pub mod peer_event { } #[derive(serde::Serialize)] #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct LocalTrack { #[prost(int32, tag = "1")] pub track: i32, @@ -383,7 +383,7 @@ pub mod peer_event { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PeerRes {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -408,7 +408,7 @@ pub struct RecordRes { pub s3_uri: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetParams { #[prost(uint32, tag = "1")] pub page: u32, @@ -439,7 +439,7 @@ pub mod get_rooms { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetPeerParams { #[prost(int32, optional, tag = "1")] pub room: ::core::option::Option, @@ -521,7 +521,7 @@ pub mod get_sessions { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GetEventParams { #[prost(uint64, optional, tag = "1")] pub session: ::core::option::Option, diff --git a/packages/protocol/src/protobuf/cluster_gateway.rs b/packages/protocol/src/protobuf/cluster_gateway.rs index 6ba3b7eb..330ad0bd 100644 --- a/packages/protocol/src/protobuf/cluster_gateway.rs +++ b/packages/protocol/src/protobuf/cluster_gateway.rs @@ -1,6 +1,6 @@ // This file is @generated by prost-build. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GatewayEvent { #[prost(oneof = "gateway_event::Event", tags = "1")] pub event: ::core::option::Option, @@ -8,14 +8,14 @@ pub struct GatewayEvent { /// Nested message and enum types in `GatewayEvent`. pub mod gateway_event { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Event { #[prost(message, tag = "1")] Ping(super::PingEvent), } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct PingEvent { #[prost(uint32, tag = "3")] pub cpu: u32, @@ -31,10 +31,10 @@ pub struct PingEvent { /// Nested message and enum types in `PingEvent`. pub mod ping_event { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct MediaOrigin {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct GatewayOrigin { #[prost(uint32, tag = "1")] pub zone: u32, @@ -44,7 +44,7 @@ pub mod ping_event { /// Nested message and enum types in `GatewayOrigin`. pub mod gateway_origin { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Location { #[prost(float, tag = "1")] pub lat: f32, @@ -53,7 +53,7 @@ pub mod ping_event { } } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct ServiceStats { #[prost(uint32, tag = "1")] pub live: u32, @@ -63,7 +63,7 @@ pub mod ping_event { pub active: bool, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Origin { #[prost(message, tag = "1")] Media(MediaOrigin), @@ -72,7 +72,7 @@ pub mod ping_event { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Empty {} /// For whip #[allow(clippy::derive_partial_eq_without_eq)] @@ -214,7 +214,7 @@ pub struct WebrtcRemoteIceRequest { pub candidates: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct WebrtcRemoteIceResponse { #[prost(uint32, tag = "1")] pub added: u32, diff --git a/packages/protocol/src/protobuf/features.mixer.rs b/packages/protocol/src/protobuf/features.mixer.rs index 7548c370..dcaef090 100644 --- a/packages/protocol/src/protobuf/features.mixer.rs +++ b/packages/protocol/src/protobuf/features.mixer.rs @@ -43,7 +43,7 @@ pub mod request { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Response { #[prost(oneof = "response::Response", tags = "1, 2")] pub response: ::core::option::Option, @@ -51,13 +51,13 @@ pub struct Response { /// Nested message and enum types in `Response`. pub mod response { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Attach {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Detach {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Response { #[prost(message, tag = "1")] Attach(Attach), @@ -84,7 +84,7 @@ pub mod server_event { >, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SlotUnset { #[prost(uint32, tag = "1")] pub slot: u32, diff --git a/packages/protocol/src/protobuf/features.rs b/packages/protocol/src/protobuf/features.rs index 5211a477..ef885563 100644 --- a/packages/protocol/src/protobuf/features.rs +++ b/packages/protocol/src/protobuf/features.rs @@ -21,7 +21,7 @@ pub mod request { } } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Response { #[prost(oneof = "response::Response", tags = "1")] pub response: ::core::option::Option, @@ -29,7 +29,7 @@ pub struct Response { /// Nested message and enum types in `Response`. pub mod response { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Response { #[prost(message, tag = "1")] Mixer(super::mixer::Response), diff --git a/packages/protocol/src/protobuf/gateway.rs b/packages/protocol/src/protobuf/gateway.rs index a70aa941..b295b134 100644 --- a/packages/protocol/src/protobuf/gateway.rs +++ b/packages/protocol/src/protobuf/gateway.rs @@ -28,7 +28,7 @@ pub struct RemoteIceRequest { pub candidates: ::prost::alloc::vec::Vec<::prost::alloc::string::String>, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RemoteIceResponse { #[prost(uint32, tag = "1")] pub added: u32, diff --git a/packages/protocol/src/protobuf/session.rs b/packages/protocol/src/protobuf/session.rs index 829285f7..eadfc9af 100644 --- a/packages/protocol/src/protobuf/session.rs +++ b/packages/protocol/src/protobuf/session.rs @@ -42,7 +42,7 @@ pub mod request { pub token: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Leave {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -53,7 +53,7 @@ pub mod request { pub sdp: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Disconnect {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] @@ -120,7 +120,7 @@ pub mod request { >, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Detach {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] @@ -156,7 +156,7 @@ pub mod request { >, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Detach {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] @@ -203,10 +203,10 @@ pub mod response { /// Nested message and enum types in `Session`. pub mod session { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Join {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Leave {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -215,7 +215,7 @@ pub mod response { pub sdp: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Disconnect {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Oneof)] @@ -231,7 +231,7 @@ pub mod response { } } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Room { #[prost(oneof = "room::Response", tags = "1, 2")] pub response: ::core::option::Option, @@ -239,13 +239,13 @@ pub mod response { /// Nested message and enum types in `Room`. pub mod room { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct SubscribePeer {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct UnsubscribePeer {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Response { #[prost(message, tag = "1")] Subscribe(SubscribePeer), @@ -254,7 +254,7 @@ pub mod response { } } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Sender { #[prost(oneof = "sender::Response", tags = "1, 2, 3")] pub response: ::core::option::Option, @@ -262,16 +262,16 @@ pub mod response { /// Nested message and enum types in `Sender`. pub mod sender { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Attach {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Detach {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Config {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Response { #[prost(message, tag = "1")] Attach(Attach), @@ -282,7 +282,7 @@ pub mod response { } } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Receiver { #[prost(oneof = "receiver::Response", tags = "1, 2, 3")] pub response: ::core::option::Option, @@ -290,16 +290,16 @@ pub mod response { /// Nested message and enum types in `Receiver`. pub mod receiver { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Attach {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Detach {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Config {} #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Response { #[prost(message, tag = "1")] Attach(Attach), @@ -345,7 +345,7 @@ pub mod server_event { /// Nested message and enum types in `Session`. pub mod session { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Connected {} #[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] @@ -486,7 +486,7 @@ pub mod server_event { /// Nested message and enum types in `Sender`. pub mod sender { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct State { #[prost( enumeration = "super::super::super::shared::sender::Status", @@ -495,7 +495,7 @@ pub mod server_event { pub status: i32, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Event { #[prost(message, tag = "2")] State(State), @@ -512,7 +512,7 @@ pub mod server_event { /// Nested message and enum types in `Receiver`. pub mod receiver { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct State { #[prost( enumeration = "super::super::super::shared::receiver::Status", @@ -521,7 +521,7 @@ pub mod server_event { pub status: i32, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Stats { #[prost(message, optional, tag = "1")] pub source: ::core::option::Option, @@ -531,7 +531,7 @@ pub mod server_event { /// Nested message and enum types in `Stats`. pub mod stats { #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Source { #[prost(uint32, tag = "1")] pub bitrate_kbps: u32, @@ -543,7 +543,7 @@ pub mod server_event { pub jitter: f32, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Transmit { #[prost(uint32, tag = "1")] pub spatial: u32, @@ -554,13 +554,13 @@ pub mod server_event { } } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct VoiceActivity { #[prost(int32, tag = "1")] pub audio_level: i32, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Oneof)] + #[derive(Clone, Copy, PartialEq, ::prost::Oneof)] pub enum Event { #[prost(message, tag = "2")] State(State), diff --git a/packages/protocol/src/protobuf/shared.rs b/packages/protocol/src/protobuf/shared.rs index 2da8359b..ef679a4a 100644 --- a/packages/protocol/src/protobuf/shared.rs +++ b/packages/protocol/src/protobuf/shared.rs @@ -1,6 +1,6 @@ // This file is @generated by prost-build. #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Pagination { #[prost(uint32, tag = "1")] pub total: u32, @@ -36,7 +36,7 @@ pub mod receiver { pub track: ::prost::alloc::string::String, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Config { #[prost(uint32, tag = "1")] pub priority: u32, @@ -120,7 +120,7 @@ pub mod sender { pub metadata: ::core::option::Option<::prost::alloc::string::String>, } #[allow(clippy::derive_partial_eq_without_eq)] - #[derive(Clone, PartialEq, ::prost::Message)] + #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Config { #[prost(uint32, tag = "1")] pub priority: u32, @@ -181,7 +181,7 @@ pub struct Tracks { pub senders: ::prost::alloc::vec::Vec, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RoomInfoPublish { #[prost(bool, tag = "1")] pub peer: bool, @@ -189,7 +189,7 @@ pub struct RoomInfoPublish { pub tracks: bool, } #[allow(clippy::derive_partial_eq_without_eq)] -#[derive(Clone, PartialEq, ::prost::Message)] +#[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct RoomInfoSubscribe { #[prost(bool, tag = "1")] pub peers: bool,