Skip to content

Commit

Permalink
Clippy fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@irvingoujAtDevolution
irvingoujAtDevolution committed Mar 20, 2024
1 parent 2694c2f commit 6f25747
Show file tree
Hide file tree
Showing 3 changed files with 54 additions and 78 deletions.
14 changes: 5 additions & 9 deletions examples/register.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,8 @@ fn main() {
let args: Vec<String> = env::args().collect();
let mut should_unreg = false;
for arg in args.iter() {
match arg.as_str() {
"--unregister" => should_unreg = true,
_ => {}
if arg.as_str() == "--unregister" {
should_unreg = true
}
}

Expand Down Expand Up @@ -85,12 +84,9 @@ fn main() {
// Monitor the daemon events.
while let Ok(event) = monitor.recv() {
println!("Daemon event: {:?}", &event);
match event {
DaemonEvent::Error(e) => {
println!("Failed: {}", e);
break;
}
_ => {}
if let DaemonEvent::Error(e) = event {
println!("Failed: {}", e);
break;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/service_info.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -743,7 +743,7 @@ mod tests {

// test decode
let decoded = decode_txt(&encoded);
assert!(&properties[..] == &decoded[..]);
assert!(properties[..] == decoded[..]);

// test empty value
let properties = vec![TxtProperty::from(&("key3", ""))];
Expand Down
116 changes: 48 additions & 68 deletions tests/mdns_test.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,8 +211,7 @@ fn integration_success() {
}
},
Err(e) => {
println!("browse error: {}", e);
assert!(false);
panic!("browse error: {}", e);
}
}
}
Expand Down Expand Up @@ -282,8 +281,7 @@ fn service_without_properties_with_alter_net_v4() {
}
},
Err(e) => {
println!("browse error: {}", e);
assert!(false);
panic!("browse error: {}", e);
}
}
}
Expand Down Expand Up @@ -357,8 +355,7 @@ fn service_without_properties_with_alter_net_v6() {
}
},
Err(e) => {
println!("browse error: {}", e);
assert!(false);
panic!("browse error: {}", e);
}
}
}
Expand Down Expand Up @@ -479,26 +476,21 @@ fn service_with_named_interface_only() {
let timeout = Duration::from_secs(2);
let mut resolved = false;

loop {
match browse_chan.recv_timeout(timeout) {
Ok(event) => match event {
ServiceEvent::ServiceResolved(info) => {
let addrs = info.get_addresses();
resolved = true;
println!(
"Resolved a service of {} addr(s): {:?}",
&info.get_fullname(),
addrs
);
break;
}
e => {
println!("Received event {:?}", e);
}
},
Err(_) => {
while let Ok(event) = browse_chan.recv_timeout(timeout) {
match event {
ServiceEvent::ServiceResolved(info) => {
let addrs = info.get_addresses();
resolved = true;
println!(
"Resolved a service of {} addr(s): {:?}",
&info.get_fullname(),
addrs
);
break;
}
e => {
println!("Received event {:?}", e);
}
}
}

Expand All @@ -520,26 +512,21 @@ fn service_with_named_interface_only() {
let timeout = Duration::from_secs(2);
let mut resolved = false;

loop {
match browse_chan.recv_timeout(timeout) {
Ok(event) => match event {
ServiceEvent::ServiceResolved(info) => {
let addrs = info.get_addresses();
resolved = true;
println!(
"Resolved a service of {} addr(s): {:?}",
&info.get_fullname(),
addrs
);
break;
}
e => {
println!("Received event {:?}", e);
}
},
Err(_) => {
while let Ok(event) = browse_chan.recv_timeout(timeout) {
match event {
ServiceEvent::ServiceResolved(info) => {
let addrs = info.get_addresses();
resolved = true;
println!(
"Resolved a service of {} addr(s): {:?}",
&info.get_fullname(),
addrs
);
break;
}
e => {
println!("Received event {:?}", e);
}
}
}

Expand Down Expand Up @@ -579,30 +566,25 @@ fn service_with_ipv4_only() {
let timeout = Duration::from_secs(2);
let mut resolved = false;

loop {
match browse_chan.recv_timeout(timeout) {
Ok(event) => match event {
ServiceEvent::ServiceResolved(info) => {
let addrs = info.get_addresses();
resolved = true;
println!(
"Resolved a service of {} addr(s): {:?}",
&info.get_fullname(),
addrs
);
assert!(!info.get_addresses().is_empty());
for addr in info.get_addresses().iter() {
assert!(addr.is_ipv4());
}
break;
}
e => {
println!("Received event {:?}", e);
while let Ok(event) = browse_chan.recv_timeout(timeout) {
match event {
ServiceEvent::ServiceResolved(info) => {
let addrs = info.get_addresses();
resolved = true;
println!(
"Resolved a service of {} addr(s): {:?}",
&info.get_fullname(),
addrs
);
assert!(!info.get_addresses().is_empty());
for addr in info.get_addresses().iter() {
assert!(addr.is_ipv4());
}
},
Err(_) => {
break;
}
e => {
println!("Received event {:?}", e);
}
}
}

Expand Down Expand Up @@ -774,8 +756,7 @@ fn subtype() {
}
},
Err(e) => {
println!("browse error: {}", e);
assert!(false);
panic!("browse error: {}", e);
}
}
}
Expand Down Expand Up @@ -811,9 +792,8 @@ fn service_name_check() {
// Verify that the daemon reported error.
let event = monitor.recv_timeout(Duration::from_millis(500)).unwrap();
assert!(matches!(event, DaemonEvent::Error(_)));
match event {
DaemonEvent::Error(e) => println!("Daemon error: {}", e),
_ => {}
if let DaemonEvent::Error(e) = event {
println!("Daemon error: {}", e)
}

// Verify that we can increase the service name length max.
Expand Down

0 comments on commit 6f25747

Please sign in to comment.