Correct incorrect assertion in VecDeque::wrap_copy #29545
Merged
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
|
r? @aturon (rust_highfive has picked a reviewer for you, use r? to override) |
|
Thanks! @bors r+ |
|
📌 Commit 26db717 has been approved by |
| (if src <= dst { dst - src } else { src - dst }) + len <= self.cap(), | ||
| "dst={} src={} len={} cap={}", dst, src, len, self.cap()); | ||
| #[allow(dead_code)] | ||
| fn diff(a: usize, b: usize) -> usize {if a <= b {b - a} else {a - b}} |
There was a problem hiding this comment.
not sure its worth very much making this function instead of keeping it inlined.
There was a problem hiding this comment.
I agree. Not a big fan of this code, but it works, which is better than the old code :)
There was a problem hiding this comment.
It's called twice, so I think it's ok.
bors
added a commit
that referenced
this pull request
Nov 3, 2015
I think this should fix the test failures in debug mode from #29492 The assertion was written incorrectly, and I don't like the way the new assertion is written, but I _think_ it does the right thing now.
# for free
to join this conversation on GitHub.
Already have an account?
# 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.
I think this should fix the test failures in debug mode from #29492
The assertion was written incorrectly, and I don't like the way the new assertion is written, but I think it does the right thing now.