fix clippy warning

yngrtc · yngrtc · commit 870e66ad9331 · 2024-05-08T21:30:19.000-07:00
diff --git a/dtls/src/conn/mod.rs b/dtls/src/conn/mod.rs
@@ -200,8 +200,8 @@ impl DTLSConn {
             if let Some(remote_addr) = conn.remote_addr() {
                 server_name = remote_addr.ip().to_string();
             } else {
-                log::warn!("conn.remote_addr is empty, please set explicitly server_name in Config! Use default \"localhost\" as server_name now");
-                server_name = "localhost".to_owned();
+                warn!("conn.remote_addr is empty, please set explicitly server_name in Config! Use default \"localhost\" as server_name now");
+                "localhost".clone_into(&mut server_name);
             }
         }
 
diff --git a/dtls/src/flight/flight0.rs b/dtls/src/flight/flight0.rs
@@ -135,7 +135,7 @@ impl Flight for Flight0 {
                         }
                     }
                     Extension::ServerName(e) => {
-                        state.server_name = e.server_name.clone(); // remote server name
+                        state.server_name.clone_from(&e.server_name); // remote server name
                     }
                     _ => {}
                 }
diff --git a/dtls/src/flight/flight1.rs b/dtls/src/flight/flight1.rs
@@ -102,7 +102,7 @@ impl Flight for Flight1 {
                 ));
             }
 
-            state.cookie = h.cookie.clone();
+            state.cookie.clone_from(&h.cookie);
             state.handshake_recv_sequence = seq;
             Ok(Box::new(Flight3 {}))
         } else {
diff --git a/dtls/src/flight/flight3.rs b/dtls/src/flight/flight3.rs
@@ -88,7 +88,7 @@ impl Flight for Flight3 {
                     ));
                 }
 
-                state.cookie = h.cookie.clone();
+                state.cookie.clone_from(&h.cookie);
                 state.handshake_recv_sequence = seq;
                 return Ok(Box::new(Flight3 {}) as Box<dyn Flight + Send + Sync>);
             }
@@ -302,7 +302,7 @@ impl Flight for Flight3 {
                     ))
                 }
             };
-            state.peer_certificates = h.certificate.clone();
+            state.peer_certificates.clone_from(&h.certificate);
         }
 
         if let Some(message) = msgs.get(&HandshakeType::ServerKeyExchange) {
@@ -430,7 +430,7 @@ pub(crate) fn handle_server_key_exchange(
             }
         };
 
-        state.identity_hint = h.identity_hint.clone();
+        state.identity_hint.clone_from(&h.identity_hint);
         state.pre_master_secret = prf_psk_pre_master_secret(&psk);
     } else {
         let local_keypair = match h.named_curve.generate_keypair() {
diff --git a/dtls/src/flight/flight4.rs b/dtls/src/flight/flight4.rs
@@ -108,7 +108,7 @@ impl Flight for Flight4 {
                 }
             };
 
-            state.peer_certificates = h.certificate.clone();
+            state.peer_certificates.clone_from(&h.certificate);
             trace!(
                 "[handshake] PeerCertificates4 {}",
                 state.peer_certificates.len()
@@ -303,7 +303,9 @@ impl Flight for Flight4 {
                             }
                         };
 
-                        state.identity_hint = client_key_exchange.identity_hint.clone();
+                        state
+                            .identity_hint
+                            .clone_from(&client_key_exchange.identity_hint);
                         pre_master_secret = prf_psk_pre_master_secret(&psk);
                     } else if let Some(local_keypair) = &state.local_keypair {
                         pre_master_secret = match prf_pre_master_secret(
diff --git a/dtls/src/flight/flight5.rs b/dtls/src/flight/flight5.rs
@@ -228,10 +228,14 @@ impl Flight for Flight5 {
         };
         if cfg.local_psk_callback.is_none() {
             if let Some(local_keypair) = &state.local_keypair {
-                client_key_exchange.public_key = local_keypair.public_key.clone();
+                client_key_exchange
+                    .public_key
+                    .clone_from(&local_keypair.public_key);
             }
         } else if let Some(local_psk_identity_hint) = &cfg.local_psk_identity_hint {
-            client_key_exchange.identity_hint = local_psk_identity_hint.clone();
+            client_key_exchange
+                .identity_hint
+                .clone_from(local_psk_identity_hint);
         }
 
         pkts.push(Packet {
diff --git a/dtls/src/state.rs b/dtls/src/state.rs
@@ -183,7 +183,7 @@ impl State {
         self.is_client = serialized.is_client;
 
         // Set master secret
-        self.master_secret = serialized.master_secret.clone();
+        self.master_secret.clone_from(&serialized.master_secret);
 
         // Set cipher suite
         self.cipher_suite = Arc::new(Mutex::new(Some(cipher_suite_for_id(
@@ -193,8 +193,9 @@ impl State {
         self.srtp_protection_profile = serialized.srtp_protection_profile.into();
 
         // Set remote certificate
-        self.peer_certificates = serialized.peer_certificates.clone();
-        self.identity_hint = serialized.identity_hint.clone();
+        self.peer_certificates
+            .clone_from(&serialized.peer_certificates);
+        self.identity_hint.clone_from(&serialized.identity_hint);
 
         Ok(())
     }
diff --git a/examples/examples/offer-answer/answer.rs b/examples/examples/offer-answer/answer.rs
@@ -245,7 +245,7 @@ async fn main() -> Result<()> {
 
     {
         let mut oa = ADDRESS.lock().await;
-        *oa = offer_addr.clone();
+        oa.clone_from(&offer_addr);
     }
 
     // Prepare the configuration
diff --git a/examples/examples/offer-answer/offer.rs b/examples/examples/offer-answer/offer.rs
@@ -203,7 +203,7 @@ async fn main() -> Result<()> {
 
     {
         let mut oa = ADDRESS.lock().await;
-        *oa = answer_addr.clone();
+        oa.clone_from(&answer_addr);
     }
 
     // Prepare the configuration
diff --git a/examples/examples/signal/src/lib.rs b/examples/examples/signal/src/lib.rs
@@ -75,6 +75,7 @@ pub async fn http_sdp_server(port: u16) -> mpsc::Receiver<String> {
 }
 
 /// must_read_stdin blocks until input is received from stdin
+#[allow(clippy::assigning_clones)]
 pub fn must_read_stdin() -> Result<String> {
     let mut line = String::new();
 
diff --git a/ice/src/agent/agent_internal.rs b/ice/src/agent/agent_internal.rs
@@ -541,7 +541,7 @@ impl AgentInternal {
         {
             let local_candidates = self.local_candidates.lock().await;
             if let Some(cands) = local_candidates.get(&network_type) {
-                local_cands = cands.clone();
+                local_cands.clone_from(cands);
             }
         }
 
@@ -593,7 +593,7 @@ impl AgentInternal {
         {
             let remote_candidates = self.remote_candidates.lock().await;
             if let Some(cands) = remote_candidates.get(&network_type) {
-                remote_cands = cands.clone();
+                remote_cands.clone_from(cands);
             }
         }
 
diff --git a/ice/src/agent/agent_test.rs b/ice/src/agent/agent_test.rs
@@ -1934,8 +1934,8 @@ async fn test_get_remote_credentials() -> Result<()> {
 
     let (remote_ufrag, remote_pwd) = {
         let mut ufrag_pwd = a.internal.ufrag_pwd.lock().await;
-        ufrag_pwd.remote_ufrag = "remoteUfrag".to_owned();
-        ufrag_pwd.remote_pwd = "remotePwd".to_owned();
+        "remoteUfrag".clone_into(&mut ufrag_pwd.remote_ufrag);
+        "remotePwd".clone_into(&mut ufrag_pwd.remote_pwd);
         (
             ufrag_pwd.remote_ufrag.to_owned(),
             ufrag_pwd.remote_pwd.to_owned(),
diff --git a/ice/src/candidate/candidate_base.rs b/ice/src/candidate/candidate_base.rs
@@ -434,7 +434,7 @@ pub fn unmarshal_candidate(raw: &str) -> Result<impl Candidate> {
             }
 
             // RelatedAddress
-            rel_addr = split2[1].to_owned();
+            split2[1].clone_into(&mut rel_addr);
 
             // RelatedPort
             rel_port = split2[3].parse()?;
diff --git a/interceptor/src/twcc/mod.rs b/interceptor/src/twcc/mod.rs
@@ -133,7 +133,7 @@ impl Feedback {
             self.chunks.push(self.last_chunk.encode());
         }
         self.rtcp.packet_chunks.extend_from_slice(&self.chunks);
-        self.rtcp.recv_deltas = self.deltas.clone();
+        self.rtcp.recv_deltas.clone_from(&self.deltas);
 
         self.rtcp.clone()
     }
diff --git a/stun/benches/bench.rs b/stun/benches/bench.rs
@@ -501,7 +501,7 @@ fn benchmark_message(c: &mut Criterion) {
         c.bench_function("BenchmarkDecode", |b| {
             b.iter(|| {
                 mdecoded.reset();
-                mdecoded.raw = m.raw.clone();
+                mdecoded.raw.clone_from(&m.raw);
                 mdecoded.decode().unwrap();
             })
         });
diff --git a/stun/src/integrity/integrity_test.rs b/stun/src/integrity/integrity_test.rs
@@ -30,7 +30,7 @@ fn test_message_integrity_add_to_simple() -> Result<()> {
         m.write_header();
 
         let mut d_m = Message::new();
-        d_m.raw = m.raw.clone();
+        d_m.raw.clone_from(&m.raw);
         d_m.decode()?;
         i.check(&mut d_m)?;
 
diff --git a/turn/benches/bench.rs b/turn/benches/bench.rs
@@ -44,7 +44,7 @@ fn benchmark_chan_data(c: &mut Criterion) {
         c.bench_function("BenchmarkChannelData_Decode", |b| {
             b.iter(|| {
                 d.reset();
-                d.raw = buf.clone();
+                d.raw.clone_from(&buf);
                 d.decode().unwrap();
             })
         });
diff --git a/util/src/vnet/net/net_test.rs b/util/src/vnet/net/net_test.rs
@@ -116,7 +116,7 @@ async fn test_net_native_unexpected_operations() -> Result<()> {
     for ifc in &ifcs {
         if let Some(addr) = ifc.addr {
             if addr.ip().is_loopback() {
-                lo_name = ifc.name.clone();
+                lo_name.clone_from(&ifc.name);
                 break;
             }
         }
diff --git a/webrtc/src/ice_transport/ice_server.rs b/webrtc/src/ice_transport/ice_server.rs
@@ -34,12 +34,12 @@ impl RTCIceServer {
                 if self.username.is_empty() || self.credential.is_empty() {
                     return Err(Error::ErrNoTurnCredentials);
                 }
-                url.username = self.username.clone();
+                url.username.clone_from(&self.username);
 
                 match self.credential_type {
                     RTCIceCredentialType::Password => {
                         // https://www.w3.org/TR/webrtc/#set-the-configuration (step #11.3.3)
-                        url.password = self.credential.clone();
+                        url.password.clone_from(&self.credential);
                     }
                     RTCIceCredentialType::Oauth => {
                         // https://www.w3.org/TR/webrtc/#set-the-configuration (step #11.3.4)
diff --git a/webrtc/src/peer_connection/configuration.rs b/webrtc/src/peer_connection/configuration.rs
@@ -53,6 +53,7 @@ impl RTCConfiguration {
     /// get_iceservers side-steps the strict parsing mode of the ice package
     /// (as defined in https://tools.ietf.org/html/rfc7064) by copying and then
     /// stripping any erroneous queries from "stun(s):" URLs before parsing.
+    #[allow(clippy::assigning_clones)]
     pub(crate) fn get_ice_servers(&self) -> Vec<RTCIceServer> {
         let mut ice_servers = self.ice_servers.clone();
 
diff --git a/webrtc/src/peer_connection/mod.rs b/webrtc/src/peer_connection/mod.rs
@@ -859,7 +859,7 @@ impl RTCPeerConnection {
 
         {
             let mut last_offer = self.internal.last_offer.lock().await;
-            *last_offer = offer.sdp.clone();
+            last_offer.clone_from(&offer.sdp);
         }
         Ok(offer)
     }
@@ -974,7 +974,7 @@ impl RTCPeerConnection {
 
         {
             let mut last_answer = self.internal.last_answer.lock().await;
-            *last_answer = answer.sdp.clone();
+            last_answer.clone_from(&answer.sdp);
         }
         Ok(answer)
     }
@@ -1225,11 +1225,11 @@ impl RTCPeerConnection {
             match desc.sdp_type {
                 RTCSdpType::Answer | RTCSdpType::Pranswer => {
                     let last_answer = self.internal.last_answer.lock().await;
-                    desc.sdp = last_answer.clone();
+                    desc.sdp.clone_from(&last_answer);
                 }
                 RTCSdpType::Offer => {
                     let last_offer = self.internal.last_offer.lock().await;
-                    desc.sdp = last_offer.clone();
+                    desc.sdp.clone_from(&last_offer);
                 }
                 _ => return Err(Error::ErrPeerConnSDPTypeInvalidValueSetLocalDescription),
             }
diff --git a/webrtc/src/peer_connection/sdp/mod.rs b/webrtc/src/peer_connection/sdp/mod.rs
@@ -189,8 +189,8 @@ pub(crate) fn track_details_from_sdp(
                         if track_idx < tracks_in_media_section.len() {
                             tracks_in_media_section[track_idx].mid = SmolStr::from(mid_value);
                             tracks_in_media_section[track_idx].kind = codec_type;
-                            tracks_in_media_section[track_idx].stream_id = stream_id.to_owned();
-                            tracks_in_media_section[track_idx].id = track_id.to_owned();
+                            stream_id.clone_into(&mut tracks_in_media_section[track_idx].stream_id);
+                            track_id.clone_into(&mut tracks_in_media_section[track_idx].id);
                             tracks_in_media_section[track_idx].ssrcs = vec![ssrc];
                             tracks_in_media_section[track_idx].repair_ssrc = repair_ssrc;
                         } else {
@@ -248,7 +248,7 @@ pub(crate) fn get_rids(media: &MediaDescription) -> Vec<SimulcastRid> {
                 log::warn!("Failed to parse RID: {}", err);
             }
         } else if attr.key.as_str() == SDP_ATTRIBUTE_SIMULCAST {
-            simulcast_attr = attr.value.clone();
+            simulcast_attr.clone_from(&attr.value);
         }
     }
 
diff --git a/webrtc/src/rtp_transceiver/rtp_receiver/mod.rs b/webrtc/src/rtp_transceiver/rtp_receiver/mod.rs
@@ -270,7 +270,7 @@ impl RTPReceiverInternal {
             let tracks = self.tracks.read().await;
             for t in &*tracks {
                 if t.track.tid() == tid {
-                    rtp_interceptor = t.stream.rtp_interceptor.clone();
+                    rtp_interceptor.clone_from(&t.stream.rtp_interceptor);
                     //ssrc = t.track.ssrc();
                     break;
                 }
@@ -478,7 +478,9 @@ impl RTCRtpReceiver {
         for (idx, codec) in params.codecs.iter().enumerate() {
             let t = &mut tracks[idx];
             if let Some(stream_info) = &mut t.stream.stream_info {
-                stream_info.rtp_header_extensions = header_extensions.clone();
+                stream_info
+                    .rtp_header_extensions
+                    .clone_from(&header_extensions);
             }
 
             let current_track = &t.track;

Original file line number	Diff line number	Diff line change
`@@ -200,8 +200,8 @@ impl DTLSConn {`
`200`	`200`	`if let Some(remote_addr) = conn.remote_addr() {`
`201`	`201`	`server_name = remote_addr.ip().to_string();`
`202`	`202`	`} else {`
`203`		`- log::warn!("conn.remote_addr is empty, please set explicitly server_name in Config! Use default \"localhost\" as server_name now");`
`204`		`- server_name = "localhost".to_owned();`
	`203`	`+ warn!("conn.remote_addr is empty, please set explicitly server_name in Config! Use default \"localhost\" as server_name now");`
	`204`	`+ "localhost".clone_into(&mut server_name);`
`205`	`205`	`}`
`206`	`206`	`}`
`207`	`207`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,7 @@ impl Flight for Flight0 {`
`135`	`135`	`}`
`136`	`136`	`}`
`137`	`137`	`Extension::ServerName(e) => {`
`138`		`- state.server_name = e.server_name.clone(); // remote server name`
	`138`	`+ state.server_name.clone_from(&e.server_name); // remote server name`
`139`	`139`	`}`
`140`	`140`	`_ => {}`
`141`	`141`	`}`
Original file line number	Diff line number	Diff line change
`@@ -102,7 +102,7 @@ impl Flight for Flight1 {`
`102`	`102`	`));`
`103`	`103`	`}`
`104`	`104`
`105`		`- state.cookie = h.cookie.clone();`
	`105`	`+ state.cookie.clone_from(&h.cookie);`
`106`	`106`	`state.handshake_recv_sequence = seq;`
`107`	`107`	`Ok(Box::new(Flight3 {}))`
`108`	`108`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ impl Flight for Flight3 {`
`88`	`88`	`));`
`89`	`89`	`}`
`90`	`90`
`91`		`- state.cookie = h.cookie.clone();`
	`91`	`+ state.cookie.clone_from(&h.cookie);`
`92`	`92`	`state.handshake_recv_sequence = seq;`
`93`	`93`	`return Ok(Box::new(Flight3 {}) as Box<dyn Flight + Send + Sync>);`
`94`	`94`	`}`
`@@ -302,7 +302,7 @@ impl Flight for Flight3 {`
`302`	`302`	`))`
`303`	`303`	`}`
`304`	`304`	`};`
`305`		`- state.peer_certificates = h.certificate.clone();`
	`305`	`+ state.peer_certificates.clone_from(&h.certificate);`
`306`	`306`	`}`
`307`	`307`
`308`	`308`	`if let Some(message) = msgs.get(&HandshakeType::ServerKeyExchange) {`
`@@ -430,7 +430,7 @@ pub(crate) fn handle_server_key_exchange(`
`430`	`430`	`}`
`431`	`431`	`};`
`432`	`432`
`433`		`- state.identity_hint = h.identity_hint.clone();`
	`433`	`+ state.identity_hint.clone_from(&h.identity_hint);`
`434`	`434`	`state.pre_master_secret = prf_psk_pre_master_secret(&psk);`
`435`	`435`	`} else {`
`436`	`436`	`let local_keypair = match h.named_curve.generate_keypair() {`
Original file line number	Diff line number	Diff line change
`@@ -245,7 +245,7 @@ async fn main() -> Result<()> {`
`245`	`245`
`246`	`246`	`{`
`247`	`247`	`let mut oa = ADDRESS.lock().await;`
`248`		`- *oa = offer_addr.clone();`
	`248`	`+ oa.clone_from(&offer_addr);`
`249`	`249`	`}`
`250`	`250`
`251`	`251`	`// Prepare the configuration`
Original file line number	Diff line number	Diff line change
`@@ -203,7 +203,7 @@ async fn main() -> Result<()> {`
`203`	`203`
`204`	`204`	`{`
`205`	`205`	`let mut oa = ADDRESS.lock().await;`
`206`		`- *oa = answer_addr.clone();`
	`206`	`+ oa.clone_from(&answer_addr);`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`// Prepare the configuration`
Original file line number	Diff line number	Diff line change
`@@ -75,6 +75,7 @@ pub async fn http_sdp_server(port: u16) -> mpsc::Receiver<String> {`
`75`	`75`	`}`
`76`	`76`
`77`	`77`	`/// must_read_stdin blocks until input is received from stdin`
	`78`	`+#[allow(clippy::assigning_clones)]`
`78`	`79`	`pub fn must_read_stdin() -> Result<String> {`
`79`	`80`	`let mut line = String::new();`
`80`	`81`