Remove HybridBitSet::dummy #55127
Merged
Remove HybridBitSet::dummy #55127
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
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
| } | ||
| let mut new_dense = self_sparse.to_dense(); | ||
| let changed = new_dense.union(other_dense); | ||
| mem::replace(self, HybridBitSet::Dense(new_dense)); |
ljedrz
force-pushed
the
simplify_hybridbitset
branch
from
497e53c
to
5d8f0e1
Compare
|
@matthewjasper comment addressed. |
nnethercote
reviewed
Oct 16, 2018
| } | ||
| let mut new_dense = self_sparse.to_dense(); | ||
| let changed = new_dense.union(other_dense); | ||
| *self = HybridBitSet::Dense(new_dense); |
There was a problem hiding this comment.
The indentation on this line is wrong.
| let changed = dense.insert(elem); | ||
| assert!(changed); | ||
| *self = HybridBitSet::Dense(dense); | ||
| changed | ||
| } | ||
|
|
There was a problem hiding this comment.
Might as well remove this blank line, now.
|
I tried this patch with an oldish (~3 weeks ago) repo and got compile errors, and then I updated and now it works. I figure NLL must have been enabled for rustc in the meantime? |
|
Yes, it got enabled with the beta upgrade |
|
Cool, I didn't know it would improve this code. That's nice! |
ljedrz
force-pushed
the
simplify_hybridbitset
branch
from
5d8f0e1
to
1dd92c4
Compare
|
Whitespaces fixed. |
|
@bors r+ |
|
📌 Commit 1dd92c4 has been approved by |
bors
added
S-waiting-on-bors
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Oct 18, 2018
…thewjasper Remove HybridBitSet::dummy This simplifies some of the `HybridBitSet` code. cc @nnethercote
bors
added a commit
that referenced
this pull request
Oct 18, 2018
Rollup of 18 pull requests Successful merges: - #54646 (improve documentation on std::thread::sleep) - #54933 (Cleanup the rest of codegen_llvm) - #54964 (Run both lldb and gdb tests) - #55016 (Deduplicate some code and compile-time values around vtables) - #55031 (Improve verify_llvm_ir config option) - #55050 (doc std::fmt: the Python inspiration is already mentioned in precedin…) - #55077 (rustdoc: Use dyn keyword when rendering dynamic traits) - #55080 (Detect if access to localStorage is forbidden by the user's browser) - #55090 (regression test for move out of borrow via pattern) - #55102 (resolve: Do not skip extern prelude during speculative resolution) - #55104 (Add test for #34229) - #55111 ([Rustc Book] Explain --cfg's arguments) - #55122 (Cleanup mir/borrowck) - #55127 (Remove HybridBitSet::dummy) - #55128 (Fix LLVMRustInlineAsmVerify return type mismatch) - #55142 (miri: layout should not affect CTFE checks (outside of validation)) - #55151 (Cleanup nll) - #55161 ([librustdoc] Disable spellcheck for search field)
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.
This simplifies some of the
HybridBitSetcode.cc @nnethercote