bump MSRV, fix nits

Author: mhils

.github/workflows/autofix.yml

@@ -11,7 +11,7 @@ concurrency:
   cancel-in-progress: true
 
 env:
-  MSRV: "1.86"  # Minimum Supported Rust Version
+  MSRV: "1.87"  # Minimum Supported Rust Version
 
 jobs:
   protobuf:

.github/workflows/ci.yml

@@ -22,13 +22,13 @@ jobs:
       matrix:
         include:
           - os: windows-latest
-            rust: "1.86"  # MSRV - can't use variables here.
+            rust: "1.87"  # MSRV - can't use variables here.
             args: --exclude mitmproxy-linux-ebpf
           - os: macos-latest
-            rust: "1.86"  # MSRV - can't use variables here.
+            rust: "1.87"  # MSRV - can't use variables here.
             args: --exclude mitmproxy-linux-ebpf
           - os: ubuntu-22.04
-            rust: "1.86"  # MSRV - can't use variables here.
+            rust: "1.87"  # MSRV - can't use variables here.
             args: --exclude mitmproxy-linux-ebpf
           - os: ubuntu-latest
             rust: stable

Cargo.toml

@@ -32,7 +32,7 @@ version = "0.13.0-dev"
 publish = false
 repository = "https://github.com/mitmproxy/mitmproxy-rs"
 edition = "2021"
-rust-version = "1.86"  # MSRV
+rust-version = "1.87"  # MSRV
 
 [workspace.dependencies]
 aya = { version = "0.13.0", default-features = false }
@@ -123,3 +123,6 @@ opt-level = 3
 
 [features]
 tracing = ["console-subscriber"]
+# This feature solely exists to silence warnings caused by objc 0.2.7,
+# see https://github.com/SSheldon/rust-objc/issues/125
+cargo-clippy = []

mitmproxy-contentviews/src/hex_stream.rs

@@ -38,7 +38,7 @@ impl Prettify for HexStream {
 impl Reencode for HexStream {
     fn reencode(&self, data: &str, _metadata: &dyn Metadata) -> Result<Vec<u8>> {
         let data = data.trim_end_matches(['\n', '\r']);
-        if data.len() % 2 != 0 {
+        if data.len().is_multiple_of(2) {
             anyhow::bail!("Invalid hex string: uneven number of characters");
         }
         data_encoding::HEXLOWER_PERMISSIVE

mitmproxy-rs/src/server/local_redirector.rs

@@ -100,7 +100,7 @@ pub fn start_local_redirector(
     py: Python<'_>,
     handle_tcp_stream: PyObject,
     handle_udp_stream: PyObject,
-) -> PyResult<Bound<PyAny>> {
+) -> PyResult<Bound<'_, PyAny>> {
     #[cfg(windows)]
     {
         let executable_path: std::path::PathBuf = py

mitmproxy-rs/src/server/tun.rs

@@ -67,7 +67,7 @@ pub fn create_tun_interface(
     handle_tcp_stream: PyObject,
     handle_udp_stream: PyObject,
     tun_name: Option<String>,
-) -> PyResult<Bound<PyAny>> {
+) -> PyResult<Bound<'_, PyAny>> {
     #[cfg(target_os = "linux")]
     {
         let conf = mitmproxy::packet_sources::tun::TunConf { tun_name };

mitmproxy-rs/src/server/udp.rs

@@ -58,7 +58,7 @@ pub fn start_udp_server(
     host: IpAddr,
     port: u16,
     handle_udp_stream: PyObject,
-) -> PyResult<Bound<PyAny>> {
+) -> PyResult<Bound<'_, PyAny>> {
     let conf = UdpConf {
         listen_addr: SocketAddr::from((host, port)),
     };

mitmproxy-rs/src/server/wireguard.rs

@@ -69,7 +69,7 @@ pub fn start_wireguard_server(
     peer_public_keys: Vec<String>,
     handle_tcp_stream: PyObject,
     handle_udp_stream: PyObject,
-) -> PyResult<Bound<PyAny>> {
+) -> PyResult<Bound<'_, PyAny>> {
     let private_key = string_to_key(private_key)?;
     let peer_public_keys = peer_public_keys
         .into_iter()

mitmproxy-rs/src/udp_client.rs

@@ -25,7 +25,7 @@ pub fn open_udp_connection(
     host: String,
     port: u16,
     local_addr: Option<(String, u16)>,
-) -> PyResult<Bound<PyAny>> {
+) -> PyResult<Bound<'_, PyAny>> {
     pyo3_async_runtimes::tokio::future_into_py(py, async move {
         let socket = udp_connect(host, port, local_addr).await?;
 

src/processes/macos_icons.rs

@@ -68,19 +68,14 @@ pub fn tiff_data_for_executable(executable: &Path) -> Result<Vec<u8>> {
             if executable == path.to_path_buf() {
                 let pid = pid.as_u32();
                 unsafe {
-                    #[allow(unexpected_cfgs)]
                     let app: id = msg_send![
                         class!(NSRunningApplication),
                         runningApplicationWithProcessIdentifier: pid
                     ];
                     if !app.is_null() {
-                        #[allow(unexpected_cfgs)]
                         let img: id = msg_send![app, icon];
-                        #[allow(unexpected_cfgs)]
                         let tiff: id = msg_send![img, TIFFRepresentation];
-                        #[allow(unexpected_cfgs)]
                         let length: usize = msg_send![tiff, length];
-                        #[allow(unexpected_cfgs)]
                         let bytes: *const u8 = msg_send![tiff, bytes];
                         let data = std::slice::from_raw_parts(bytes, length).to_vec();
                         return Ok(data);