Skip to content

Commit

Permalink
rebase main
Browse files Browse the repository at this point in the history
  • Loading branch information
irvingoujAtDevolution committed Mar 20, 2024
1 parent 6f25747 commit 83f1202
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ default = ["async", "logging"]
flume = { version = "0.11", default-features = false } # channel between threads
if-addrs = { version = "0.10", features = ["link-local"] } # get local IP addresses
log = { version = "0.4", optional = true } # logging
polling = "3.4.0" # select/poll sockets
polling = "2.1" # select/poll sockets
socket2 = { version = "0.5.5", features = ["all"] } # socket APIs

[dev-dependencies]
Expand Down
1 change: 1 addition & 0 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@
//! - Only support multicast, not unicast send/recv.
//! - Only support 32-bit or bigger platforms, not 16-bit platforms.
#![forbid(unsafe_code)]
#![allow(clippy::single_component_path_imports)]

// log for logging (optional).
Expand Down
8 changes: 4 additions & 4 deletions src/service_daemon.rs
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ pub enum UnregisterStatus {
}

/// Status code for the service daemon.
#[derive(Debug, PartialEq, Clone, Eq)]
#[derive(Debug, PartialEq, Clone)]
#[non_exhaustive]
pub enum DaemonStatus {
/// The daemon is running as normal.
Expand Down Expand Up @@ -2305,9 +2305,9 @@ mod tests {

#[test]
fn test_instance_name() {
assert!(valid_instance_name("my-laser._printer._tcp.local."));
assert!(valid_instance_name("my-laser.._printer._tcp.local."));
assert!(!valid_instance_name("_printer._tcp.local."));
assert_eq!(valid_instance_name("my-laser._printer._tcp.local."), true);
assert_eq!(valid_instance_name("my-laser.._printer._tcp.local."), true);
assert_eq!(valid_instance_name("_printer._tcp.local."), false);
}

#[test]
Expand Down
2 changes: 1 addition & 1 deletion src/service_info.rs
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

0 comments on commit 83f1202

Please sign in to comment.