Merge pull request #1597 from microsoft/ab-code-improvements-v6

demikernel: v6: series of patches with code improvements

Author: anandbonde

src/catnap/linux/active_socket.rs

@@ -161,7 +161,7 @@ impl ActiveSocketData {
         // Trim the buffer and leave for next read if we got more than expected.
         if let Ok(remainder) = incoming.split_back(bytes_read) {
             if !remainder.is_empty() {
-                self.recv_queue.push_front(Ok((addr.clone(), remainder)));
+                self.recv_queue.push_front(Ok((addr, remainder)));
             }
         }
 

src/collections/hashttlcache.rs

@@ -173,7 +173,6 @@ mod test {
     #[test]
     fn evict_by_explicit_ttl_case1() -> Result<()> {
         let now = Instant::now();
-        let now = now;
         let ttl = Duration::from_secs(1);
         let later = now + ttl;
         let mut cache = HashTtlCache::new(now, None);

src/inetstack/protocols/layer3/arp/tests.rs

@@ -200,14 +200,13 @@ fn arp_cache_timeout() -> Result<()> {
 fn build_arp_query(local_mac: &MacAddress, local_ipv4: &Ipv4Addr, remote_ipv4: &Ipv4Addr) -> DemiBuffer {
     let body: ArpHeader = ArpHeader::new(
         ArpOperation::Request,
-        local_mac.clone(),
-        local_ipv4.clone(),
+        *local_mac,
+        *local_ipv4,
         MacAddress::broadcast(),
-        remote_ipv4.clone(),
+        *remote_ipv4,
     );
     let mut pkt: DemiBuffer = body.create_and_serialize();
-    let eth2_header: Ethernet2Header =
-        Ethernet2Header::new(MacAddress::broadcast(), local_mac.clone(), EtherType2::Arp);
+    let eth2_header: Ethernet2Header = Ethernet2Header::new(MacAddress::broadcast(), *local_mac, EtherType2::Arp);
     eth2_header.serialize_and_attach(&mut pkt);
     pkt
 }

src/inetstack/protocols/layer4/tcp/tests/simulator.rs

@@ -102,7 +102,7 @@ fn collect_tests(test_path: &str) -> Result<Vec<String>> {
         directories.push(test_path.to_string());
 
         // Recurse through all directories.
-        while directories.len() > 0 {
+        while !directories.is_empty() {
             let directory: String = directories.pop().unwrap();
             for entry in std::fs::read_dir(&directory)? {
                 let entry: DirEntry = entry?;
@@ -172,16 +172,16 @@ impl Simulation {
         let lines: Vec<String> = Self::read_input_file(filename)?;
         Ok(Simulation {
             protocol: None,
-            local_mac: local_mac.clone(),
-            remote_mac: remote_mac.clone(),
+            local_mac: *local_mac,
+            remote_mac: *remote_mac,
             engine: local,
             now,
             local_qd: None,
             remote_qd: None,
             inflight: VecDeque::with_capacity(4),
-            local_sockaddr: SocketAddrV4::new(local_ipv4.clone(), local_ephemeral_port),
+            local_sockaddr: SocketAddrV4::new(*local_ipv4, local_ephemeral_port),
             local_port,
-            remote_sockaddr: SocketAddrV4::new(remote_ipv4.clone(), remote_ephemeral_port),
+            remote_sockaddr: SocketAddrV4::new(*remote_ipv4, remote_ephemeral_port),
             remote_port,
             lines,
         })
@@ -451,7 +451,7 @@ impl Simulation {
 
         let remote_addr: SocketAddrV4 = match args.addr {
             None => {
-                self.remote_sockaddr = SocketAddrV4::new(self.remote_sockaddr.ip().clone(), self.remote_port);
+                self.remote_sockaddr = SocketAddrV4::new(*self.remote_sockaddr.ip(), self.remote_port);
                 self.remote_sockaddr
             },
             Some(addr) => {
@@ -616,7 +616,7 @@ impl Simulation {
 
         let remote_addr: SocketAddrV4 = match args.addr {
             None => {
-                self.remote_sockaddr = SocketAddrV4::new(self.remote_sockaddr.ip().clone(), self.remote_port);
+                self.remote_sockaddr = SocketAddrV4::new(*self.remote_sockaddr.ip(), self.remote_port);
                 self.remote_sockaddr
             },
             Some(addr) => {
@@ -695,12 +695,12 @@ impl Simulation {
         for option in options {
             match option {
                 TcpOption::Noop => option_list.push(TcpOptions2::NoOperation),
-                TcpOption::Mss(mss) => option_list.push(TcpOptions2::MaximumSegmentSize(mss.clone())),
-                TcpOption::WindowScale(wscale) => option_list.push(TcpOptions2::WindowScale(wscale.clone())),
+                TcpOption::Mss(mss) => option_list.push(TcpOptions2::MaximumSegmentSize(*mss)),
+                TcpOption::WindowScale(wscale) => option_list.push(TcpOptions2::WindowScale(*wscale)),
                 TcpOption::SackOk => option_list.push(TcpOptions2::SelectiveAcknowlegementPermitted),
                 TcpOption::Timestamp(sender, echo) => option_list.push(TcpOptions2::Timestamp {
-                    sender_timestamp: sender.clone(),
-                    echo_timestamp: echo.clone(),
+                    sender_timestamp: *sender,
+                    echo_timestamp: *echo,
                 }),
                 TcpOption::EndOfOptions => option_list.push(TcpOptions2::EndOfOptionsList),
             }

src/runtime/mod.rs

@@ -733,8 +733,8 @@ mod tests {
         let mut qts: [QToken; NUM_TASKS] = [QToken::from(0); NUM_TASKS];
         let mut runtime: SharedDemiRuntime = SharedDemiRuntime::default();
         // Insert a large number of coroutines.
-        for i in 0..NUM_TASKS {
-            qts[i] = expect_ok!(
+        for qt in qts.iter_mut().take(NUM_TASKS) {
+            *qt = expect_ok!(
                 runtime.insert_nonpolling_coroutine(
                     "dummy coroutine",
                     Box::pin(dummy_coroutine(1000000000, QDesc::from(0)).fuse())
@@ -753,8 +753,8 @@ mod tests {
         let mut qts: [QToken; NUM_TASKS] = [QToken::from(0); NUM_TASKS];
         let mut runtime: SharedDemiRuntime = SharedDemiRuntime::default();
         // Insert a large number of coroutines.
-        for i in 0..NUM_TASKS {
-            qts[i] = expect_ok!(
+        for qt in qts.iter_mut().take(NUM_TASKS) {
+            *qt = expect_ok!(
                 runtime.insert_io_polling_coroutine(
                     "dummy background coroutine",
                     Box::pin(dummy_background_coroutine().fuse()),