Skip to content

Commit 65099ce

Browse files
mhilsmhils
committed
cargo clippy --fix
1 parent 564769c commit 65099ce

File tree

10 files changed

+78
-84
lines changed

10 files changed

+78
-84
lines changed

‎mitmproxy-contentviews/src/protobuf/existing_proto_definitions.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -89,19 +89,19 @@ fn find_best_message(
8989
}
9090

9191
let file = fds.first()?;
92-
if let Some(service) = file.services().next() {
93-
if let Some(method) = service.methods().next() {
94-
log::info!(
95-
"Falling back to first defined service in {}: {}",
96-
file.name(),
97-
service.proto().name()
98-
);
99-
return Some(if is_request {
100-
method.input_type()
101-
} else {
102-
method.output_type()
103-
});
104-
}
92+
if let Some(service) = file.services().next()
93+
&& let Some(method) = service.methods().next()
94+
{
95+
log::info!(
96+
"Falling back to first defined service in {}: {}",
97+
file.name(),
98+
service.proto().name()
99+
);
100+
return Some(if is_request {
101+
method.input_type()
102+
} else {
103+
method.output_type()
104+
});
105105
}
106106
if let Some(method) = file.messages().next() {
107107
log::info!(

‎mitmproxy-contentviews/src/protobuf/raw_to_proto.rs‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,13 @@ fn guess_field_type(
182182
parent.file_descriptor_proto().package.clone(),
183183
&format!("{}.UnknownField{}", parent.name_to_package(), field_index),
184184
);
185-
if let Ok(descriptor) = create_descriptor_proto(values[0], &existing) {
186-
if values
185+
if let Ok(descriptor) = create_descriptor_proto(values[0], &existing)
186+
&& values
187187
.iter()
188188
.skip(1)
189189
.all(|data| descriptor.descriptor_dyn().parse_from_bytes(data).is_ok())
190-
{
191-
return GuessedFieldType::Message(Box::new(descriptor));
192-
}
190+
{
191+
return GuessedFieldType::Message(Box::new(descriptor));
193192
}
194193

195194
GuessedFieldType::Unknown

‎mitmproxy-contentviews/src/protobuf/reencode.rs‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -138,29 +138,29 @@ fn add_field(message: &mut dyn MessageDyn, field_num: u32, value: Value) -> anyh
138138
}
139139

140140
fn int_value(n: Number, field: Option<&FieldDescriptor>) -> UnknownValue {
141-
if let Some(field) = field {
142-
if let Some(typ) = field.proto().type_.and_then(|t| t.enum_value().ok()) {
143-
match typ {
144-
TYPE_FIXED64 | Type::TYPE_SFIXED64 | Type::TYPE_DOUBLE => {
145-
return if let Some(n) = n.as_u64() {
146-
UnknownValue::Fixed64(n)
147-
} else if let Some(n) = n.as_i64() {
148-
UnknownValue::sfixed64(n)
149-
} else {
150-
UnknownValue::double(n.as_f64().expect("as_f64 never fails"))
151-
};
152-
}
153-
TYPE_FIXED32 | Type::TYPE_SFIXED32 | Type::TYPE_FLOAT => {
154-
return if let Some(n) = n.as_u64() {
155-
UnknownValue::Fixed32(n as u32)
156-
} else if let Some(n) = n.as_i64() {
157-
UnknownValue::sfixed32(n as i32)
158-
} else {
159-
UnknownValue::float(n.as_f64().expect("as_f64 never fails") as f32)
160-
};
161-
}
162-
_ => (),
141+
if let Some(field) = field
142+
&& let Some(typ) = field.proto().type_.and_then(|t| t.enum_value().ok())
143+
{
144+
match typ {
145+
TYPE_FIXED64 | Type::TYPE_SFIXED64 | Type::TYPE_DOUBLE => {
146+
return if let Some(n) = n.as_u64() {
147+
UnknownValue::Fixed64(n)
148+
} else if let Some(n) = n.as_i64() {
149+
UnknownValue::sfixed64(n)
150+
} else {
151+
UnknownValue::double(n.as_f64().expect("as_f64 never fails"))
152+
};
153+
}
154+
TYPE_FIXED32 | Type::TYPE_SFIXED32 | Type::TYPE_FLOAT => {
155+
return if let Some(n) = n.as_u64() {
156+
UnknownValue::Fixed32(n as u32)
157+
} else if let Some(n) = n.as_i64() {
158+
UnknownValue::sfixed32(n as i32)
159+
} else {
160+
UnknownValue::float(n.as_f64().expect("as_f64 never fails") as f32)
161+
};
163162
}
163+
_ => (),
164164
}
165165
}
166166
if let Some(n) = n.as_u64() {

‎mitmproxy-contentviews/src/protobuf/view_grpc.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,10 @@ impl Prettify for GRPC {
2323
fn prettify(&self, data: &[u8], metadata: &dyn Metadata) -> Result<String> {
2424
let encoding = metadata.get_header("grpc-encoding").unwrap_or_default();
2525
let proto_def = existing_proto_definitions::find_best_match(metadata)?;
26-
if let Some(descriptor) = &proto_def {
27-
if let Ok(ret) = self.prettify_with_descriptor(data, &encoding, descriptor) {
28-
return Ok(ret);
29-
}
26+
if let Some(descriptor) = &proto_def
27+
&& let Ok(ret) = self.prettify_with_descriptor(data, &encoding, descriptor)
28+
{
29+
return Ok(ret);
3030
}
3131
let ret = self.prettify_with_descriptor(data, &encoding, &DescriptorWithDeps::default())?;
3232
if proto_def.is_some() {

‎mitmproxy-contentviews/src/protobuf/view_protobuf.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,10 +40,10 @@ impl Prettify for Protobuf {
4040

4141
fn prettify(&self, data: &[u8], metadata: &dyn Metadata) -> Result<String> {
4242
let proto_def = existing_proto_definitions::find_best_match(metadata)?;
43-
if let Some(descriptor) = &proto_def {
44-
if let Ok(ret) = self.prettify_with_descriptor(data, descriptor) {
45-
return Ok(ret);
46-
}
43+
if let Some(descriptor) = &proto_def
44+
&& let Ok(ret) = self.prettify_with_descriptor(data, descriptor)
45+
{
46+
return Ok(ret);
4747
}
4848
let ret = self.prettify_with_descriptor(data, &DescriptorWithDeps::default())?;
4949
if proto_def.is_some() {

‎mitmproxy-rs/src/task.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -133,11 +133,11 @@ impl PyInteropTask {
133133
// Future is not finished: abort tokio task
134134
handle.abort();
135135

136-
if let Err(err) = handle.await {
137-
if !err.is_cancelled() {
138-
// JoinError was not caused by cancellation: coroutine panicked, log error
139-
log::error!("TCP connection handler coroutine panicked: {err}");
140-
}
136+
if let Err(err) = handle.await
137+
&& !err.is_cancelled()
138+
{
139+
// JoinError was not caused by cancellation: coroutine panicked, log error
140+
log::error!("TCP connection handler coroutine panicked: {err}");
141141
}
142142
}
143143
}

‎src/network/core.rs‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ impl NetworkStack<'_> {
4141
} => (packet, tunnel_info),
4242
};
4343

44-
if let SmolPacket::V4(p) = &packet {
45-
if !p.verify_checksum() {
46-
log::warn!("Received invalid IP packet (checksum error).");
47-
return Ok(());
48-
}
44+
if let SmolPacket::V4(p) = &packet
45+
&& !p.verify_checksum()
46+
{
47+
log::warn!("Received invalid IP packet (checksum error).");
48+
return Ok(());
4949
}
5050

5151
match packet.transport_protocol() {
@@ -92,14 +92,13 @@ impl NetworkStack<'_> {
9292
pub fn handle_transport_command(&mut self, command: TransportCommand) {
9393
if command.connection_id().is_tcp() {
9494
self.tcp.handle_transport_command(command);
95-
} else if let Some(packet) = self.udp.handle_transport_command(command) {
96-
if self
95+
} else if let Some(packet) = self.udp.handle_transport_command(command)
96+
&& self
9797
.net_tx
9898
.try_send(NetworkCommand::SendPacket(SmolPacket::from(packet)))
9999
.is_err()
100-
{
101-
log::debug!("Channel unavailable, discarding UDP packet.");
102-
}
100+
{
101+
log::debug!("Channel unavailable, discarding UDP packet.");
103102
}
104103
}
105104

‎src/network/virtual_device.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ impl Device for VirtualDevice {
4343
return None;
4444
}
4545

46-
if let Ok(permit) = self.tx_channel.try_reserve() {
47-
if let Some(buffer) = self.rx_buffer.pop_front() {
48-
let rx = Self::RxToken { buffer };
49-
let tx = VirtualTxToken { permit };
50-
return Some((rx, tx));
51-
}
46+
if let Ok(permit) = self.tx_channel.try_reserve()
47+
&& let Some(buffer) = self.rx_buffer.pop_front()
48+
{
49+
let rx = Self::RxToken { buffer };
50+
let tx = VirtualTxToken { permit };
51+
return Some((rx, tx));
5252
}
5353

5454
None

‎src/packet_sources/macos.rs‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,11 +338,10 @@ impl ConnectionTask {
338338
let Ok(_) = self.stream.write_buf(&mut write_buf).await else {
339339
break; // Client has disconnected.
340340
};
341-
if write_buf.is_empty() {
342-
if let Some(tx) = drain_tx.take() {
341+
if write_buf.is_empty()
342+
&& let Some(tx) = drain_tx.take() {
343343
tx.send(()).ok();
344344
}
345-
}
346345
},
347346
Ok(()) = self.stream.readable(), if read_tx.is_some() => {
348347
let (n, tx) = read_tx.take().unwrap();

‎src/processes/macos_icons.rs‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,15 @@ pub fn tiff_data_for_executable(executable: &Path) -> Result<Vec<u8>> {
6363
);
6464
for (pid, process) in sys.processes() {
6565
// process.exe() will return empty path if there was an error while trying to read /proc/<pid>/exe.
66-
if let Some(path) = process.exe() {
67-
if executable == path.to_path_buf() {
68-
let pid = pid.as_u32() as i32;
69-
if let Some(app) =
70-
NSRunningApplication::runningApplicationWithProcessIdentifier(pid)
71-
{
72-
if let Some(img) = app.icon() {
73-
if let Some(tiff) = img.TIFFRepresentation() {
74-
return Ok(tiff.to_vec());
75-
}
76-
}
77-
}
66+
if let Some(path) = process.exe()
67+
&& executable == path.to_path_buf()
68+
{
69+
let pid = pid.as_u32() as i32;
70+
if let Some(app) = NSRunningApplication::runningApplicationWithProcessIdentifier(pid)
71+
&& let Some(img) = app.icon()
72+
&& let Some(tiff) = img.TIFFRepresentation()
73+
{
74+
return Ok(tiff.to_vec());
7875
}
7976
}
8077
}

0 commit comments

Comments
 (0)