Merge #74: Clear clippy warnings

4fd4cb1 Clear clippy warnings (Tobin C. Harding)
1ccfea2 CI: disable 1.41 testing on MacOS (Andrew Poelstra)

Pull request description:

  Clear all the clippy warnings introduce by a recent clippy update.

ACKs for top commit:
  apoelstra:
    ACK 4fd4cb1

Tree-SHA512: 8a1b62e68c9908e9a5073d074985292c50abab7e72be189915c1b8087bce3b219c5bff0fcf76869ba234b618eb92fb27c18379015555b2bad241b618f4e66d19

Author: apoelstra

.github/workflows/rust.yml

@@ -6,14 +6,15 @@ jobs:
   Tests:
     name: Tests
     strategy:
+      fail-fast: false
       matrix:
         os:
           - ubuntu-latest
           - macOS-latest
           - windows-latest
         toolchain:
-          - 1.41.1
           - stable
+          - 1.41.1
     runs-on: ${{ matrix.os }}
     steps:
       - name: Checkout Crate
@@ -27,7 +28,7 @@ jobs:
       - name: Running tests on ${{ matrix.toolchain }}
         env:
           DO_FEATURE_MATRIX: true
-        run: cargo test --verbose --all-features
+        run: ./contrib/test.sh
 
   Nightly:
     name: Nightly - Docs + Fmt

contrib/test.sh

@@ -11,6 +11,15 @@ if cargo --version | grep nightly; then
     NIGHTLY=true
 fi
 
+# On MacOS on 1.41 we get a link failure with syn
+# This is fixed by https://github.com/rust-lang/rust/pull/91604 (I think)
+# but implies that we can't do testing on MacOS for now, at least with 1.41.
+if cargo --version | grep "1\.41\.0"; then
+    if [ "$RUNNER_OS" = "macOS" ]; then
+        exit 0
+    fi
+fi
+
 # Defaults / sanity checks
 cargo build --all
 cargo test --all

src/client.rs

@@ -132,7 +132,7 @@ impl Client {
         let id = request.id.clone();
 
         let response = self.send_request(request)?;
-        if response.jsonrpc != None && response.jsonrpc != Some(From::from("2.0")) {
+        if response.jsonrpc.is_some() && response.jsonrpc != Some(From::from("2.0")) {
             return Err(Error::VersionMismatch);
         }
         if response.id != id {

src/simple_http.rs

@@ -479,7 +479,7 @@ mod tests {
             "http://me:weak@localhost:22/wallet",
         ];
         for u in &urls {
-            let tp = Builder::new().url(*u).unwrap().build();
+            let tp = Builder::new().url(u).unwrap().build();
             assert_eq!(tp.addr, addr);
         }
 
@@ -506,7 +506,7 @@ mod tests {
         ];
         for u in &valid_urls {
             let (addr, path) = check_url(u).unwrap();
-            let builder = Builder::new().url(*u).unwrap_or_else(|_| panic!("error for: {}", u));
+            let builder = Builder::new().url(u).unwrap_or_else(|_| panic!("error for: {}", u));
             assert_eq!(builder.tp.addr, addr);
             assert_eq!(builder.tp.path, path);
             assert_eq!(builder.tp.timeout, Duration::from_secs(15));
@@ -523,7 +523,7 @@ mod tests {
             // NB somehow, Rust's IpAddr accepts "127.0.0" and adds the extra 0..
         ];
         for u in &invalid_urls {
-            if let Ok(b) = Builder::new().url(*u) {
+            if let Ok(b) = Builder::new().url(u) {
                 let tp = b.build();
                 panic!("expected error for url {}, got {:?}", u, tp);
             }

src/simple_tcp.rs

@@ -85,7 +85,7 @@ impl TcpTransport {
     where
         R: for<'a> serde::de::Deserialize<'a>,
     {
-        let mut sock = net::TcpStream::connect(&self.addr)?;
+        let mut sock = net::TcpStream::connect(self.addr)?;
         sock.set_read_timeout(self.timeout)?;
         sock.set_write_timeout(self.timeout)?;
 
@@ -129,7 +129,7 @@ mod tests {
     fn sanity_check_tcp_transport() {
         let addr: net::SocketAddr =
             net::SocketAddrV4::new(net::Ipv4Addr::new(127, 0, 0, 1), 0).into();
-        let server = net::TcpListener::bind(&addr).unwrap();
+        let server = net::TcpListener::bind(addr).unwrap();
         let addr = server.local_addr().unwrap();
         let dummy_req = Request {
             method: "arandommethod",