Migrate to 2024 edition (#294)

Author: mhils

Cargo.lock

@@ -31,14 +31,14 @@ authors = [
 version = "0.13.0-dev"
 publish = false
 repository = "https://github.com/mitmproxy/mitmproxy-rs"
-edition = "2021"
+edition = "2024"
 rust-version = "1.88"  # MSRV
 
 [workspace.dependencies]
 aya = { version = "0.13.0", default-features = false }
 aya-ebpf = { version = "0.1.1", default-features = false }
 aya-log = { version = "0.2.1", default-features = false }
-aya-log-ebpf = { version = "0.1.1", default-features = false }
+aya-log-ebpf = { version = "0.1.0", default-features = false }
 tun = { version = "0.8.5" }
 
 [workspace.lints.clippy]
@@ -97,8 +97,7 @@ security-framework = "3.2.0"
 nix = { version = "0.30.1", default-features = false, features = ["fs"] }
 core-graphics = "0.25"
 core-foundation = "0.10"
-cocoa = "0.26"
-objc = "0.2"
+objc2-app-kit = { version = "0.3.2", features = ["NSRunningApplication", "NSImage", "libc"] }
 sysinfo = "0.36.1"
 
 [target.'cfg(target_os = "linux")'.dependencies]
@@ -123,6 +122,3 @@ 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 = []

Cargo.toml

@@ -1,4 +1,4 @@
-use criterion::{criterion_group, criterion_main, Criterion};
+use criterion::{Criterion, criterion_group, criterion_main};
 #[cfg(any(windows, target_os = "macos"))]
 use mitmproxy::processes;
 

benches/process.rs

@@ -1,5 +1,5 @@
-use criterion::{criterion_group, criterion_main, Criterion};
-use mitmproxy_contentviews::{test::TestMetadata, MsgPack, Prettify, Protobuf, Reencode};
+use criterion::{Criterion, criterion_group, criterion_main};
+use mitmproxy_contentviews::{MsgPack, Prettify, Protobuf, Reencode, test::TestMetadata};
 use std::hint::black_box;
 
 fn criterion_benchmark(c: &mut Criterion) {

mitmproxy-contentviews/benches/contentviews.rs

@@ -25,11 +25,7 @@ impl Prettify for HexDump {
     }
 
     fn render_priority(&self, data: &[u8], _metadata: &dyn Metadata) -> f32 {
-        if is_binary(data) {
-            0.5
-        } else {
-            0.0
-        }
+        if is_binary(data) { 0.5 } else { 0.0 }
     }
 }
 

mitmproxy-contentviews/src/hex_dump.rs

@@ -27,11 +27,7 @@ impl Prettify for HexStream {
     }
 
     fn render_priority(&self, data: &[u8], _metadata: &dyn Metadata) -> f32 {
-        if is_binary(data) {
-            0.4
-        } else {
-            0.0
-        }
+        if is_binary(data) { 0.4 } else { 0.0 }
     }
 }
 

mitmproxy-contentviews/src/hex_stream.rs

@@ -7,8 +7,8 @@ mod test_inspect_metadata;
 pub use hex_dump::HexDump;
 pub use hex_stream::HexStream;
 pub use msgpack::MsgPack;
-pub use protobuf::Protobuf;
 pub use protobuf::GRPC;
+pub use protobuf::Protobuf;
 pub use test_inspect_metadata::TestInspectMetadata;
 
 use anyhow::Result;

mitmproxy-contentviews/src/lib.rs

@@ -1,5 +1,5 @@
-use crate::protobuf::raw_to_proto::new_empty_descriptor;
 use crate::Metadata;
+use crate::protobuf::raw_to_proto::new_empty_descriptor;
 use anyhow::Context;
 use protobuf::reflect::{FileDescriptor, MessageDescriptor};
 use protobuf_parse::Parser;
@@ -89,19 +89,19 @@ fn find_best_message(
     }
 
     let file = fds.first()?;
-    if let Some(service) = file.services().next() {
-        if let Some(method) = service.methods().next() {
-            log::info!(
-                "Falling back to first defined service in {}: {}",
-                file.name(),
-                service.proto().name()
-            );
-            return Some(if is_request {
-                method.input_type()
-            } else {
-                method.output_type()
-            });
-        }
+    if let Some(service) = file.services().next()
+        && let Some(method) = service.methods().next()
+    {
+        log::info!(
+            "Falling back to first defined service in {}: {}",
+            file.name(),
+            service.proto().name()
+        );
+        return Some(if is_request {
+            method.input_type()
+        } else {
+            method.output_type()
+        });
     }
     if let Some(method) = file.messages().next() {
         log::info!(

mitmproxy-contentviews/src/protobuf/existing_proto_definitions.rs

@@ -1,11 +1,11 @@
 use crate::protobuf::view_protobuf::tags;
+use protobuf::MessageDyn;
 /// Parsed protobuf message => YAML value
 use protobuf::descriptor::field_descriptor_proto::Type;
 use protobuf::descriptor::field_descriptor_proto::Type::{
     TYPE_BYTES, TYPE_FIXED32, TYPE_FIXED64, TYPE_UINT64,
 };
 use protobuf::reflect::{ReflectFieldRef, ReflectValueRef};
-use protobuf::MessageDyn;
 use serde_yaml::value::TaggedValue;
 use serde_yaml::{Mapping, Number, Value};
 use std::ops::Deref;

mitmproxy-contentviews/src/protobuf/proto_to_yaml.rs

@@ -182,14 +182,13 @@ fn guess_field_type(
         parent.file_descriptor_proto().package.clone(),
         &format!("{}.UnknownField{}", parent.name_to_package(), field_index),
     );
-    if let Ok(descriptor) = create_descriptor_proto(values[0], &existing) {
-        if values
+    if let Ok(descriptor) = create_descriptor_proto(values[0], &existing)
+        && values
             .iter()
             .skip(1)
             .all(|data| descriptor.descriptor_dyn().parse_from_bytes(data).is_ok())
-        {
-            return GuessedFieldType::Message(Box::new(descriptor));
-        }
+    {
+        return GuessedFieldType::Message(Box::new(descriptor));
     }
 
     GuessedFieldType::Unknown