diff options
| author | bors <bors@rust-lang.org> | 2020-04-09 00:11:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-09 00:11:27 +0000 |
| commit | d249d756374737eb014079901ac132f1e1ed905e (patch) | |
| tree | e40a76a168a79ea3db20a0671e7367756dbc93a3 /src/liballoc | |
| parent | 1edcfc83c6a08ddc5e63fc652b149baea0236e7c (diff) | |
| parent | 5848209b64ad3403c155bc884f25500b178a5610 (diff) | |
| download | rust-d249d756374737eb014079901ac132f1e1ed905e.tar.gz rust-d249d756374737eb014079901ac132f1e1ed905e.zip | |
Auto merge of #70936 - Dylan-DPC:rollup-2ng3e5h, r=Dylan-DPC
Rollup of 7 pull requests Successful merges: - #70134 (add basic support of OsStrExt for HermitCore) - #70565 (Add inline attributes for functions used in the query system) - #70828 (rustdoc: Don't try to load source files from external crates) - #70870 (Fix abuses of tykind::err) - #70906 (Suggest move for closures and async blocks in more cases.) - #70912 (Do not suggest adding type param when `use` is already suggested) - #70930 (add tracking issue to `VecDeque::make_contiguous`) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/collections/vec_deque.rs | 2 | ||||
| -rw-r--r-- | src/liballoc/slice.rs | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/liballoc/collections/vec_deque.rs b/src/liballoc/collections/vec_deque.rs index c17a37c7bae..0ed9773630e 100644 --- a/src/liballoc/collections/vec_deque.rs +++ b/src/liballoc/collections/vec_deque.rs @@ -2104,7 +2104,7 @@ impl<T> VecDeque<T> { /// assert_eq!(slice, &[3, 2, 1] as &[_]); /// } /// ``` - #[unstable(feature = "deque_make_contiguous", issue = "none")] + #[unstable(feature = "deque_make_contiguous", issue = "70929")] pub fn make_contiguous(&mut self) -> &mut [T] { if self.is_contiguous() { let tail = self.tail; diff --git a/src/liballoc/slice.rs b/src/liballoc/slice.rs index cd750d25580..4ae7532d992 100644 --- a/src/liballoc/slice.rs +++ b/src/liballoc/slice.rs @@ -140,6 +140,7 @@ mod hack { use crate::string::ToString; use crate::vec::Vec; + #[inline] pub fn into_vec<T>(b: Box<[T]>) -> Vec<T> { unsafe { let len = b.len(); |
