Skip to content

Commit 0aef44a

Browse files
stbuehlerstbuehler
committed
format with rustfmt nightly
- apart from broken comment formatting: rust-lang/rustfmt#3148
1 parent 141f7ed commit 0aef44a

26 files changed

+927
-637
lines changed

‎build.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ fn cfg_os(family: &str) -> bool {
1212

1313
fn find_avahi_compat_dns_sd() {
1414
// on unix but not darwin link avahi compat
15-
if cfg_family("unix")
16-
&& !(cfg_os("macos") || cfg_os("ios")) {
15+
if cfg_family("unix") && !(cfg_os("macos") || cfg_os("ios")) {
1716
pkg_config::probe_library("avahi-compat-libdns_sd").unwrap();
1817
}
1918
}

‎examples/browse.rs

+127-114
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,19 @@ extern crate futures;
33
extern crate tokio_core;
44

55
use async_dnssd::TimeoutTrait;
6-
use futures::{Future,Stream};
7-
use std::env;
8-
use std::net::{IpAddr,Ipv4Addr,Ipv6Addr};
9-
use std::time::Duration;
6+
use futures::{
7+
Future,
8+
Stream,
9+
};
10+
use std::{
11+
env,
12+
net::{
13+
IpAddr,
14+
Ipv4Addr,
15+
Ipv6Addr,
16+
},
17+
time::Duration,
18+
};
1019
use tokio_core::reactor::Core;
1120

1221
fn decode_address(a: &async_dnssd::QueryRecordResult) -> Option<IpAddr> {
@@ -40,129 +49,133 @@ fn main() {
4049

4150
// Use `cargo run --example browse` to list all services broadcasting
4251
// or `cargo run --example browse -- _http._tcp` to resolve a service.
43-
let query = env::args().nth(1).unwrap_or_else(|| list_all_services.to_string());
52+
let query = env::args()
53+
.nth(1)
54+
.unwrap_or_else(|| list_all_services.to_string());
4455
println!("Browse: {}", query);
4556

46-
let listing = async_dnssd::browse(
47-
async_dnssd::Interface::Any,
48-
&query,
49-
None,
50-
&handle
51-
).expect("failed browse")
52-
.timeout(search_timeout).expect("failed timeout")
53-
.map_err(|e| e.into_io_error())
54-
.for_each(|service| {
55-
let added = service.flags & async_dnssd::BrowsedFlag::Add;
56-
if query == list_all_services {
57-
// resolving MetaQuery responses isn't useful (and fails
58-
// with "bad param")... we'd need to browse them
59-
60-
let mut reg_type = service.reg_type.as_str();
61-
if reg_type.ends_with('.') {
62-
reg_type = &reg_type[..reg_type.len()-1];
63-
}
64-
let reg_type = service.service_name.clone() + "." + reg_type;
65-
println!(
66-
"Service Type {}{:?}@{:?}\t\t[{:?}]",
67-
if added { '+' } else { '-' },
68-
reg_type,
69-
service.domain,
70-
service
71-
);
72-
73-
return Ok(());
74-
}
75-
76-
println!(
77-
"Service {}{:?}@{:?} (type {:?})\t\t[{:?}]",
78-
if added { '+' } else { '-' },
79-
service.service_name,
80-
service.domain,
81-
service.reg_type,
82-
service
83-
);
84-
85-
if !added {
86-
// only resolve added services
87-
return Ok(());
88-
}
57+
let listing =
58+
async_dnssd::browse(async_dnssd::Interface::Any, &query, None, &handle)
59+
.expect("failed browse")
60+
.timeout(search_timeout)
61+
.expect("failed timeout")
62+
.map_err(|e| e.into_io_error())
63+
.for_each(|service| {
64+
let added = service.flags & async_dnssd::BrowsedFlag::Add;
65+
if query == list_all_services {
66+
// resolving MetaQuery responses isn't useful (and fails
67+
// with "bad param")... we'd need to browse them
8968

90-
let service_name_e = service.service_name.clone();
69+
let mut reg_type = service.reg_type.as_str();
70+
if reg_type.ends_with('.') {
71+
reg_type = &reg_type[..reg_type.len() - 1];
72+
}
73+
let reg_type =
74+
service.service_name.clone() + "." + reg_type;
75+
println!(
76+
"Service Type {}{:?}@{:?}\t\t[{:?}]",
77+
if added { '+' } else { '-' },
78+
reg_type,
79+
service.domain,
80+
service
81+
);
9182

92-
let inner_handle = handle.clone();
93-
handle.spawn(
94-
match service.resolve(&handle) {
95-
Ok(r) => r,
96-
Err(e) => {
97-
println!("resolve failed: {:?}", e);
9883
return Ok(());
9984
}
100-
}
101-
.timeout(resolve_timeout).expect("failed timeout")
102-
.map_err(|e| e.into_io_error())
103-
.for_each(move |r| {
85+
10486
println!(
105-
"Resolved {:?}: {:?}:{} (txt {:?})\t\t[{:?}]",
87+
"Service {}{:?}@{:?} (type {:?})\t\t[{:?}]",
88+
if added { '+' } else { '-' },
10689
service.service_name,
107-
r.host_target,
108-
r.port,
109-
String::from_utf8_lossy(&r.txt),
110-
r
90+
service.domain,
91+
service.reg_type,
92+
service
11193
);
112-
let host_target = r.host_target.clone();
113-
let host_target_e = r.host_target.clone();
114-
inner_handle.spawn(
115-
// Query IPv4
116-
async_dnssd::query_record(
117-
async_dnssd::QueryRecordFlags::none(),
118-
async_dnssd::Interface::Any,
119-
&r.host_target,
120-
1, // 1 = A.
121-
1,
122-
&inner_handle
123-
)?
124-
.timeout(address_timeout)?
125-
.select(
126-
// Query IPv6 and merge the results
127-
async_dnssd::query_record(
128-
async_dnssd::QueryRecordFlags::none(),
129-
async_dnssd::Interface::Any,
130-
&r.host_target,
131-
28, // 28 = AAAA.
132-
1,
133-
&inner_handle
134-
)?
135-
.timeout(address_timeout)?
136-
)
94+
95+
if !added {
96+
// only resolve added services
97+
return Ok(());
98+
}
99+
100+
let service_name_e = service.service_name.clone();
101+
102+
let inner_handle = handle.clone();
103+
handle.spawn(
104+
match service.resolve(&handle) {
105+
Ok(r) => r,
106+
Err(e) => {
107+
println!("resolve failed: {:?}", e);
108+
return Ok(());
109+
},
110+
}
111+
.timeout(resolve_timeout)
112+
.expect("failed timeout")
137113
.map_err(|e| e.into_io_error())
138-
.for_each(move |a| {
139-
match decode_address(&a) {
140-
Some(addr) => println!(
141-
"Address for {}: {}\t\t[{:?}]",
142-
host_target,
143-
addr,
144-
a
145-
),
146-
None => println!(
147-
"Address for {}: <unknown>\t\t[{:?}]",
148-
host_target,
149-
a
150-
),
151-
}
152-
Ok(())
153-
}).or_else(move |e| {
154-
println!("query_record {} failed: {}", host_target_e, e);
114+
.for_each(move |r| {
115+
println!(
116+
"Resolved {:?}: {:?}:{} (txt {:?})\t\t[{:?}]",
117+
service.service_name,
118+
r.host_target,
119+
r.port,
120+
String::from_utf8_lossy(&r.txt),
121+
r
122+
);
123+
let host_target = r.host_target.clone();
124+
let host_target_e = r.host_target.clone();
125+
inner_handle.spawn(
126+
// Query IPv4
127+
async_dnssd::query_record(
128+
async_dnssd::QueryRecordFlags::none(),
129+
async_dnssd::Interface::Any,
130+
&r.host_target,
131+
1, // 1 = A.
132+
1,
133+
&inner_handle,
134+
)?
135+
.timeout(address_timeout)?
136+
.select(
137+
// Query IPv6 and merge the results
138+
async_dnssd::query_record(
139+
async_dnssd::QueryRecordFlags::none(),
140+
async_dnssd::Interface::Any,
141+
&r.host_target,
142+
28, // 28 = AAAA.
143+
1,
144+
&inner_handle,
145+
)?
146+
.timeout(address_timeout)?,
147+
)
148+
.map_err(|e| e.into_io_error())
149+
.for_each(move |a| {
150+
match decode_address(&a) {
151+
Some(addr) => println!(
152+
"Address for {}: {}\t\t[{:?}]",
153+
host_target, addr, a
154+
),
155+
None => println!(
156+
"Address for {}: <unknown>\t\t[{:?}]",
157+
host_target, a
158+
),
159+
}
160+
Ok(())
161+
})
162+
.or_else(move |e| {
163+
println!(
164+
"query_record {} failed: {}",
165+
host_target_e, e
166+
);
167+
Ok(())
168+
}),
169+
);
155170
Ok(())
156171
})
172+
.or_else(move |e| {
173+
println!("resolve {:?} failed: {}", service_name_e, e);
174+
Ok(())
175+
}),
157176
);
158-
Ok(())
159-
}).or_else(move |e| {
160-
println!("resolve {:?} failed: {}", service_name_e, e);
161-
Ok(())
162-
})
163-
);
164177

165-
Ok(())
166-
});
178+
Ok(())
179+
});
167180
core.run(listing).unwrap();
168181
}

‎examples/enumerate-domains.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,10 @@ fn main() {
1414
let listing = async_dnssd::enumerate_domains(
1515
async_dnssd::Enumerate::BrowseDomains,
1616
async_dnssd::Interface::Any,
17-
&handle
18-
).unwrap().for_each(|e| {
17+
&handle,
18+
)
19+
.unwrap()
20+
.for_each(|e| {
1921
println!("Domain: {:?}", e);
2022
Ok(())
2123
});

‎examples/register.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ fn main() -> std::io::Result<()> {
99

1010
let mut core = tokio_core::reactor::Core::new()?;
1111
let handle = core.handle();
12-
let (_registration, result) = core.run(register("_ssh._tcp", 2022, Default::default(), &handle)?)?;
12+
let (_registration, result) =
13+
core.run(register("_ssh._tcp", 2022, Default::default(), &handle)?)?;
1314
println!("Registered: {:?}", result);
1415
// wait until killed
1516
core.run(futures::future::empty::<(), ()>()).unwrap();

‎rustfmt.toml

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Maximum width of each line
2+
max_width = 80
3+
4+
# Use tab characters for indentation, spaces for alignment
5+
hard_tabs = true
6+
7+
# Replace uses of the try! macro by the ? shorthand
8+
use_try_shorthand = true
9+
10+
# Use field initialize shorthand if possible.
11+
use_field_init_shorthand = true
12+
13+
### UNSTABLE FEATURES
14+
15+
# Convert /* */ comments to // comments where possible
16+
normalize_comments = true
17+
18+
# Put a trailing comma after a block based match arm (non-block arms are not affected)
19+
match_block_trailing_comma = true
20+
21+
# Item layout inside a imports block
22+
imports_layout = "Vertical"
23+
24+
# Error if unable to get all lines within max_width
25+
error_on_line_overflow = false
26+
27+
# Merge multiple imports into a single nested import.
28+
merge_imports = true
29+
30+
# Reorder impl items. type and const are put first, then macros and methods.
31+
reorder_impl_items = true

0 commit comments

Comments
 (0)