diff options
| author | bors <bors@rust-lang.org> | 2014-11-17 11:22:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-17 11:22:00 +0000 |
| commit | 0047dbe59c41b951d34ce6324f3a8c0e15d523e9 (patch) | |
| tree | e4f717adb4830ca6e737a23c81abbab3bb3a80b5 /src/libstd/sys/unix/pipe.rs | |
| parent | edfb83c9e28df2a8f326d688f3d5b1f6faa72db8 (diff) | |
| parent | ca08540a0039e827114752d11166ea8cb1387068 (diff) | |
| download | rust-0047dbe59c41b951d34ce6324f3a8c0e15d523e9.tar.gz rust-0047dbe59c41b951d34ce6324f3a8c0e15d523e9.zip | |
auto merge of #19027 : nick29581/rust/coercions-4, r=alexcrichton
The forwards compatible parts of #18645, rebased. Converts implicit coercions from `[T, ..n]` to `&[T]` into explicit references.
Diffstat (limited to 'src/libstd/sys/unix/pipe.rs')
| -rw-r--r-- | src/libstd/sys/unix/pipe.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libstd/sys/unix/pipe.rs b/src/libstd/sys/unix/pipe.rs index 67384848a94..3fba06e0c7f 100644 --- a/src/libstd/sys/unix/pipe.rs +++ b/src/libstd/sys/unix/pipe.rs @@ -281,8 +281,8 @@ impl UnixAcceptor { fd => return Ok(UnixStream::new(Arc::new(Inner::new(fd)))), } } - try!(await([self.fd(), self.inner.reader.fd()], - deadline, Readable)); + try!(await(&[self.fd(), self.inner.reader.fd()], + deadline, Readable)); } Err(eof()) @@ -295,7 +295,7 @@ impl UnixAcceptor { pub fn close_accept(&mut self) -> IoResult<()> { self.inner.closed.store(true, atomic::SeqCst); let fd = FileDesc::new(self.inner.writer.fd(), false); - match fd.write([0]) { + match fd.write(&[0]) { Ok(..) => Ok(()), Err(..) if wouldblock() => Ok(()), Err(e) => Err(e), |