rust: fix basic warnings and clippy

livekit · Dec 31, 2023 · f270ad8 · f270ad8
1 parent eb15187
commit f270ad8
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git a/livekit-ffi/src/lib.rs b/livekit-ffi/src/lib.rs
@@ -12,12 +12,12 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use std::{borrow::Cow, sync::Arc};
+use std::{borrow::Cow};
 
 use lazy_static::lazy_static;
 use livekit::prelude::*;
-use prost::Message;
-use server::FfiDataBuffer;
+
+
 use thiserror::Error;
 
 mod conversion;

diff --git a/livekit-ffi/src/server/room.rs b/livekit-ffi/src/server/room.rs
@@ -217,7 +217,7 @@ impl RoomInner {
             server.async_runtime.spawn(async move {
                 let cb = proto::PublishDataCallback {
                     async_id,
-                    error: Some(format!("failed to send data, room closed: {}", err).into()),
+                    error: Some(format!("failed to send data, room closed: {}", err)),
                 };
 
                 let _ = server.send_event(proto::ffi_event::Message::PublishData(cb)).await;

diff --git a/livekit/src/room/e2ee/manager.rs b/livekit/src/room/e2ee/manager.rs
@@ -131,7 +131,7 @@ impl E2eeManager {
         let state_changed = self.state_changed.clone();
         frame_cryptor.on_state_change(Some(Box::new(move |participant_identity, state| {
             if let Some(state_changed) = state_changed.lock().as_ref() {
-                state_changed(participant_identity.try_into().unwrap(), state);
+                state_changed(participant_identity.into(), state);
             }
         })));
     }

diff --git a/livekit/src/room/participant/local_participant.rs b/livekit/src/room/participant/local_participant.rs
@@ -25,7 +25,7 @@ use crate::{
     options::{compute_video_encodings, video_layers_from_encodings, TrackPublishOptions},
     prelude::*,
     rtc_engine::RtcEngine,
-    DataPacket, DataPacketKind,
+    DataPacket,
 };
 
 type LocalTrackPublishedHandler = Box<dyn Fn(LocalParticipant, LocalTrackPublication) + Send>;
@@ -272,7 +272,7 @@ impl LocalParticipant {
 
     pub async fn publish_data(&self, packet: DataPacket) -> RoomResult<()> {
         let data = proto::DataPacket {
-            kind: DataPacketKind::from(packet.kind) as i32,
+            kind: packet.kind as i32,
             value: Some(proto::data_packet::Value::User(proto::UserPacket {
                 payload: packet.payload,
                 topic: packet.topic,

diff --git a/livekit/src/room/publication/mod.rs b/livekit/src/room/publication/mod.rs
@@ -117,7 +117,7 @@ pub(super) fn new_inner(
     let info = PublicationInfo {
         track,
         proto_info: info.clone(),
-        source: info.source().try_into().unwrap(),
+        source: info.source().into(),
         kind: info.r#type().try_into().unwrap(),
         encryption_type: info.encryption().into(),
         name: info.name,

diff --git a/webrtc-sys/src/rtc_error.rs b/webrtc-sys/src/rtc_error.rs
@@ -117,7 +117,7 @@ mod tests {
 
         assert_eq!(error.error_type, RtcErrorType::InternalError);
         assert_eq!(error.error_detail, RtcErrorDetailType::DataChannelFailure);
-        assert_eq!(error.has_sctp_cause_code, true);
+        assert!(error.has_sctp_cause_code);
         assert_eq!(error.sctp_cause_code, 24);
         assert_eq!(error.message, "this is not a test, I repeat, this is not a test");
     }
@@ -129,7 +129,7 @@ mod tests {
 
         assert_eq!(error.error_type, RtcErrorType::InvalidModification);
         assert_eq!(error.error_detail, RtcErrorDetailType::None);
-        assert_eq!(error.has_sctp_cause_code, false);
+        assert!(!error.has_sctp_cause_code);
         assert_eq!(error.sctp_cause_code, 0);
         assert_eq!(error.message, "exception is thrown!");
     }