diff options
| author | bors <bors@rust-lang.org> | 2018-09-08 11:53:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-09-08 11:53:21 +0000 |
| commit | 05cb29e96f718a94d31afd094b1efd7c05be4269 (patch) | |
| tree | d94400c78a25cb456fa3cc0a5666061b4f4dec73 /src/libstd/sys | |
| parent | ff59ab127ac92885e4273bb73c8ac5a999c327bf (diff) | |
| parent | 51c387931ed8df9b7daece4ad64b48bdd2b8335b (diff) | |
| download | rust-05cb29e96f718a94d31afd094b1efd7c05be4269.tar.gz rust-05cb29e96f718a94d31afd094b1efd7c05be4269.zip | |
Auto merge of #54051 - kennytm:rollup, r=kennytm
Rollup of 10 pull requests Successful merges: - #53315 (use `NonZeroU32` in `newtype_index!`macro, change syntax) - #53932 ([NLL] Remove base_place) - #53942 (Rewrite `precompute_borrows_out_of_scope` for fewer hash table lookups.) - #53973 (Have rust-lldb look for the rust-enabled lldb) - #53981 (Implement initializer() for FileDesc) - #53987 (rustbuild: allow configuring llvm version suffix) - #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.) - #54007 (crates that provide a `panic_handler` are exempt from the `unused_extern_crates` lint) - #54040 (update books for next release) - #54050 (Update `petgraph` dependency to 0.4.13 to fix build with nightly)
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/fd.rs | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/fd.rs b/src/libstd/sys/unix/fd.rs index 12e14734ff5..db2ea6b660a 100644 --- a/src/libstd/sys/unix/fd.rs +++ b/src/libstd/sys/unix/fd.rs @@ -11,7 +11,7 @@ #![unstable(reason = "not public", issue = "0", feature = "fd")] use cmp; -use io::{self, Read}; +use io::{self, Read, Initializer}; use libc::{self, c_int, c_void, ssize_t}; use mem; use sync::atomic::{AtomicBool, Ordering}; @@ -270,6 +270,11 @@ impl<'a> Read for &'a FileDesc { fn read(&mut self, buf: &mut [u8]) -> io::Result<usize> { (**self).read(buf) } + + #[inline] + unsafe fn initializer(&self) -> Initializer { + Initializer::nop() + } } impl AsInner<c_int> for FileDesc { |
