Add into_inner #115
Merged
Add into_inner #115
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Converts a SmallVec into an array, provided the SmallVec has not been spilled to the heap.
mbrubeck
requested changes
Aug 13, 2018
lib.rs
Outdated
| @@ -812,6 +821,19 @@ impl<A: Array> SmallVec<A> { | |||
| } | |||
| } | |||
|
|
|||
| /// If the SmallVec has not spilled onto the heap, convert it into an `A`. Otherwise return `Err(Self)`. | |||
There was a problem hiding this comment.
This should return an error if self.len() != A::size(). Otherwise it could return uninitialized data if the vector is too short.
lib.rs
Outdated
| Err(self) | ||
| } else { | ||
| unsafe { | ||
| let data = mem::replace(&mut self.data, SmallVecData::from_inline(mem::uninitialized())); |
There was a problem hiding this comment.
This could be shortened to let data = ptr::read(&self.data);
|
@bors-servo r+ |
|
📌 Commit 852b817 has been approved by |
bors-servo
pushed a commit
that referenced
this pull request
Aug 13, 2018
Add into_inner Converts a SmallVec into an array, provided the SmallVec has not been spilled to the heap. Addresses #85. <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/115) <!-- Reviewable:end -->
|
☀️ Test successful - status-travis |
mbrubeck
added a commit
to mbrubeck/rust-smallvec
that referenced
this pull request
Aug 22, 2018
mbrubeck
added a commit
to mbrubeck/rust-smallvec
that referenced
this pull request
Aug 22, 2018
Merged
bors-servo
pushed a commit
that referenced
this pull request
Aug 22, 2018
Version 0.6.5 Change log: * #115 - add `into_inner` method * #117 - add `from_buf_and_len` and `from_buf_and_len_unchecked` * #118 - optimize `from_slice` * Some code cleanup and testing improvements (#112, #113, #114, #120) cc @llogiq <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/rust-smallvec/121) <!-- Reviewable:end -->
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Converts a SmallVec into an array, provided the SmallVec has not been spilled to the heap.
Addresses #85.
This change is