Clippy fixes for 1.87, add 1.87 to GitHub CI

Author: drcaramelsyrup

.github/workflows/build.yml

@@ -7,8 +7,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        # nightly, and latest stable
-        toolchain: [nightly, 1.82.0]
+        # nightly, msrv, and latest stable
+        toolchain: [nightly, 1.82.0, 1.87.0]
     runs-on: ubuntu-latest
     # Only run on "pull_request" event for external PRs. This is to avoid
     # duplicate builds for PRs created from internal branches.
@@ -35,10 +35,6 @@ jobs:
           toolchain: ${{ matrix.toolchain }}
           components: rustfmt, clippy
 
-      - name: Pin crates to versions for MSRV
-        run: |
-          [[ ${{ matrix.toolchain }} != 1.72.0 ]] || (cargo update -p boring --precise 4.13.0 && cargo update -p litemap --precise 0.7.4 && cargo update -p zerofrom --precise 0.1.5 && cargo update -p half --precise 2.4.1 && cargo update -p backtrace --precise 0.3.74)
-
       - name: Run cargo fmt
         run: cargo fmt --all -- --check
 
@@ -52,12 +48,12 @@ jobs:
 
       - name: Run cargo clippy
         run: |
-          [[ ${{ matrix.toolchain }} != 1.82.0 ]] || cargo clippy --all-targets --all -- --allow=unknown-lints --deny=warnings
+          [[ ${{ matrix.toolchain }} != 1.87.0 ]] || cargo clippy --all-targets --all -- --allow=unknown-lints --deny=warnings
 
       - name: Run cargo audit
         run: |
-          [[ ${{ matrix.toolchain }} != 1.82.0 ]] || (cargo install cargo-audit && cargo audit)
+          [[ ${{ matrix.toolchain }} != 1.87.0 ]] || (cargo install cargo-audit && cargo audit)
 
       - name: Run cargo machete
         run: |
-          [[ ${{ matrix.toolchain }} != 1.82.0 ]] || (cargo install cargo-machete --version 0.7.0 && cargo machete)
+          [[ ${{ matrix.toolchain }} != 1.87.0 ]] || (cargo install cargo-machete --version 0.7.0 && cargo machete)

pingora-core/src/protocols/http/v1/body.rs

@@ -341,11 +341,7 @@ impl BodyReader {
                             return Ok(Some(BufRef::new(0, existing_buf_end)));
                         }
                         /* could be expecting DATA + CRLF or just CRLF */
-                        let payload_size = if expecting_from_io > 2 {
-                            expecting_from_io - 2
-                        } else {
-                            0
-                        };
+                        let payload_size = expecting_from_io.saturating_sub(2);
                         /* expecting_from_io < existing_buf_end + 2 */
                         if expecting_from_io >= existing_buf_end {
                             self.body_state = self

pingora-openssl/src/ext.rs

@@ -94,7 +94,7 @@ pub fn ssl_set_verify_cert_store(
 /// See [SSL_use_certificate](https://www.openssl.org/docs/man1.1.1/man3/SSL_use_certificate.html).
 pub fn ssl_use_certificate(ssl: &mut SslRef, cert: &X509Ref) -> Result<(), ErrorStack> {
     unsafe {
-        cvt(SSL_use_certificate(ssl.as_ptr() as *mut SSL, cert.as_ptr() as *mut X509) as c_long)?;
+        cvt(SSL_use_certificate(ssl.as_ptr(), cert.as_ptr()) as c_long)?;
     }
     Ok(())
 }
@@ -107,7 +107,7 @@ where
     T: HasPrivate,
 {
     unsafe {
-        cvt(SSL_use_PrivateKey(ssl.as_ptr() as *mut SSL, key.as_ptr() as *mut EVP_PKEY) as c_long)?;
+        cvt(SSL_use_PrivateKey(ssl.as_ptr(), key.as_ptr()) as c_long)?;
     }
     Ok(())
 }