bump MSRV to 1.42 (#180)

.github/workflows/linux.yml

@@ -14,7 +14,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 1.39.0
+          - 1.42.0
           - stable
           - nightly
 

README.md

@@ -13,8 +13,8 @@ Actix net - framework for composable network services
 
 ## Documentation & community resources
 
-* [Chat on gitter](https://gitter.im/actix/actix)
+* [Chat on Gitter](https://gitter.im/actix/actix)
-* Minimum supported Rust version: 1.39 or later
+* Minimum supported Rust version: 1.42 or later
 
 ## Example
 

actix-server/src/builder.rs

@@ -276,7 +276,7 @@ impl ServerBuilder {
                 info!("Starting \"{}\" service on {}", sock.1, sock.2);
             }
             self.accept.start(
-                mem::replace(&mut self.sockets, Vec::new())
+                mem::take(&mut self.sockets)
                     .into_iter()
                     .map(|t| (t.0, t.2))
                     .collect(),
@@ -355,7 +355,7 @@ impl ServerBuilder {
 
                 // stop accept thread
                 self.accept.send(Command::Stop);
-                let notify = std::mem::replace(&mut self.notify, Vec::new());
+                let notify = std::mem::take(&mut self.notify);
 
                 // stop workers
                 if !self.workers.is_empty() && graceful {

actix-utils/src/timeout.rs

@@ -58,10 +58,7 @@ impl<E: PartialEq> PartialEq for TimeoutError<E> {
                 TimeoutError::Service(e2) => e1 == e2,
                 TimeoutError::Timeout => false,
             },
-            TimeoutError::Timeout => match other {
+            TimeoutError::Timeout => matches!(other, TimeoutError::Timeout),
-                TimeoutError::Service(_) => false,
-                TimeoutError::Timeout => true,
-            },
         }
     }
 }