File tree Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Expand file tree Collapse file tree 4 files changed +7
-7
lines changed Original file line number Diff line number Diff line change @@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
5
5
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8
- refs/heads/try2: f340fb9b1292f519d0bf09019cd34e7068cc9618
8
+ refs/heads/try2: cc42b619362c344aacdb84ff00243b3e32168cad
9
9
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
10
10
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
11
11
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
Original file line number Diff line number Diff line change @@ -24,7 +24,7 @@ use io::IoResult;
24
24
use io:: net:: ip:: { SocketAddr , IpAddr } ;
25
25
use option:: { Option , Some , None } ;
26
26
use rt:: rtio:: { IoFactory , LocalIo } ;
27
- use slice :: OwnedVector ;
27
+ use vec :: Vec ;
28
28
29
29
/// Hints to the types of sockets that are desired when looking up hosts
30
30
pub enum SocketType {
@@ -73,7 +73,7 @@ pub struct Info {
73
73
74
74
/// Easy name resolution. Given a hostname, returns the list of IP addresses for
75
75
/// that hostname.
76
- pub fn get_host_addresses ( host : & str ) -> IoResult < ~ [ IpAddr ] > {
76
+ pub fn get_host_addresses ( host : & str ) -> IoResult < Vec < IpAddr > > {
77
77
lookup ( Some ( host) , None , None ) . map ( |a| a. move_iter ( ) . map ( |i| i. address . ip ) . collect ( ) )
78
78
}
79
79
@@ -90,7 +90,7 @@ pub fn get_host_addresses(host: &str) -> IoResult<~[IpAddr]> {
90
90
/// FIXME: this is not public because the `Hint` structure is not ready for public
91
91
/// consumption just yet.
92
92
fn lookup ( hostname : Option < & str > , servname : Option < & str > , hint : Option < Hint > )
93
- -> IoResult < ~ [ Info ] > {
93
+ -> IoResult < Vec < Info > > {
94
94
LocalIo :: maybe_raise ( |io| io. get_host_addresses ( hostname, servname, hint) )
95
95
}
96
96
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ pub struct Process {
69
69
70
70
/// Extra I/O handles as configured by the original `ProcessConfig` when
71
71
/// this process was created. This is by default empty.
72
- pub extra_io : ~ [ Option < io:: PipeStream > ] ,
72
+ pub extra_io : Vec < Option < io:: PipeStream > > ,
73
73
}
74
74
75
75
/// This configuration describes how a new process should be spawned. A blank
@@ -418,7 +418,7 @@ impl Drop for Process {
418
418
drop ( self . stdin . take ( ) ) ;
419
419
drop ( self . stdout . take ( ) ) ;
420
420
drop ( self . stderr . take ( ) ) ;
421
- drop ( mem:: replace ( & mut self . extra_io , box [ ] ) ) ;
421
+ drop ( mem:: replace ( & mut self . extra_io , Vec :: new ( ) ) ) ;
422
422
423
423
self . wait ( ) ;
424
424
}
Original file line number Diff line number Diff line change @@ -161,7 +161,7 @@ pub trait IoFactory {
161
161
fn unix_connect ( & mut self , path : & CString ,
162
162
timeout : Option < u64 > ) -> IoResult < Box < RtioPipe : Send > > ;
163
163
fn get_host_addresses ( & mut self , host : Option < & str > , servname : Option < & str > ,
164
- hint : Option < ai:: Hint > ) -> IoResult < ~ [ ai:: Info ] > ;
164
+ hint : Option < ai:: Hint > ) -> IoResult < Vec < ai:: Info > > ;
165
165
166
166
// filesystem operations
167
167
fn fs_from_raw_fd ( & mut self , fd : c_int , close : CloseBehavior )
You can’t perform that action at this time.
0 commit comments