Skip to content

Commit 656c3ac

Browse files
committed
Auto merge of #27966 - GuillaumeGomez:iterator, r=alexcrichton
Part of #22709. cc @Veedrac r? @bluss I don't have added tests yet, I'll see how to do it tomorrow.
2 parents 19aadd5 + 528d99c commit 656c3ac

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

src/libstd/sys/common/net.rs

+3
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,9 @@ impl Iterator for LookupHost {
110110
}
111111
}
112112

113+
unsafe impl Sync for LookupHost {}
114+
unsafe impl Send for LookupHost {}
115+
113116
impl Drop for LookupHost {
114117
fn drop(&mut self) {
115118
unsafe { freeaddrinfo(self.original) }

src/test/run-pass/sync-send-in-std.rs

+31
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
2+
// file at the top-level directory of this distribution and at
3+
// http://rust-lang.org/COPYRIGHT.
4+
//
5+
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
6+
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
7+
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
8+
// option. This file may not be copied, modified, or distributed
9+
// except according to those terms.
10+
11+
#![feature(lookup_host)]
12+
13+
use std::net::lookup_host;
14+
15+
fn is_sync<T>(_: T) where T: Sync {}
16+
fn is_send<T>(_: T) where T: Send {}
17+
18+
macro_rules! all_sync_send {
19+
($ctor:expr, $($iter:ident),+) => ({
20+
$(
21+
let mut x = $ctor;
22+
is_sync(x.$iter());
23+
let mut y = $ctor;
24+
is_send(y.$iter());
25+
)+
26+
})
27+
}
28+
29+
fn main() {
30+
all_sync_send!(lookup_host("localhost").unwrap(), next);
31+
}

0 commit comments

Comments
 (0)