diff options
| author | bors <bors@rust-lang.org> | 2019-05-09 18:43:00 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-05-09 18:43:00 +0000 |
| commit | a784a80228c9eac3aa0fd86fc90887d5fa20c82e (patch) | |
| tree | 9e3f055ea50be9a3ef2bbad5dd7d1f3e18bfea2e /src/libstd | |
| parent | ef01f29964df207f181bd5bcf236e41372a17273 (diff) | |
| parent | e40f9a62bb5445767b563d888bcbfc4cd4416d38 (diff) | |
| download | rust-a784a80228c9eac3aa0fd86fc90887d5fa20c82e.tar.gz rust-a784a80228c9eac3aa0fd86fc90887d5fa20c82e.zip | |
Auto merge of #60672 - Centril:rollup-fhcx463, r=Centril
Rollup of 5 pull requests Successful merges: - #60601 (Add a `cast` method to raw pointers.) - #60638 (pin: make the to-module link more visible) - #60647 (cleanup: Remove `DefIndexAddressSpace`) - #60656 (Inline some Cursor calls for slices) - #60657 (Stabilize and re-export core::array in std) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/io/cursor.rs | 6 | ||||
| -rw-r--r-- | src/libstd/lib.rs | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/src/libstd/io/cursor.rs b/src/libstd/io/cursor.rs index 64f8659b8f8..f627fb0f562 100644 --- a/src/libstd/io/cursor.rs +++ b/src/libstd/io/cursor.rs @@ -265,6 +265,7 @@ impl<T> BufRead for Cursor<T> where T: AsRef<[u8]> { } // Non-resizing write implementation +#[inline] fn slice_write(pos_mut: &mut u64, slice: &mut [u8], buf: &[u8]) -> io::Result<usize> { let pos = cmp::min(*pos_mut, slice.len() as u64); let amt = (&mut slice[(pos as usize)..]).write(buf)?; @@ -272,6 +273,7 @@ fn slice_write(pos_mut: &mut u64, slice: &mut [u8], buf: &[u8]) -> io::Result<us Ok(amt) } +#[inline] fn slice_write_vectored( pos_mut: &mut u64, slice: &mut [u8], @@ -341,6 +343,7 @@ impl Write for Cursor<&mut [u8]> { slice_write_vectored(&mut self.pos, self.inner, bufs) } + #[inline] fn flush(&mut self) -> io::Result<()> { Ok(()) } } @@ -354,6 +357,7 @@ impl Write for Cursor<&mut Vec<u8>> { vec_write_vectored(&mut self.pos, self.inner, bufs) } + #[inline] fn flush(&mut self) -> io::Result<()> { Ok(()) } } @@ -367,6 +371,7 @@ impl Write for Cursor<Vec<u8>> { vec_write_vectored(&mut self.pos, &mut self.inner, bufs) } + #[inline] fn flush(&mut self) -> io::Result<()> { Ok(()) } } @@ -382,6 +387,7 @@ impl Write for Cursor<Box<[u8]>> { slice_write_vectored(&mut self.pos, &mut self.inner, bufs) } + #[inline] fn flush(&mut self) -> io::Result<()> { Ok(()) } } diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 215f1bbc971..3976f2344e2 100644 --- a/src/libstd/lib.rs +++ b/src/libstd/lib.rs @@ -259,7 +259,6 @@ #![feature(exact_size_is_empty)] #![feature(exhaustive_patterns)] #![feature(external_doc)] -#![feature(fixed_size_array)] #![feature(fn_traits)] #![feature(fnbox)] #![feature(generator_trait)] @@ -435,6 +434,8 @@ pub use core::char; pub use core::u128; #[stable(feature = "core_hint", since = "1.27.0")] pub use core::hint; +#[stable(feature = "core_array", since = "1.36.0")] +pub use core::array; pub mod f32; pub mod f64; |
