Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HybridIdxSet tweaks #53656

Merged
merged 2 commits into from
Aug 27, 2018
Merged

HybridIdxSet tweaks #53656

merged 2 commits into from
Aug 27, 2018

Conversation

nnethercote
Copy link
Contributor

A couple of tweaks to HybridIdxSet.

r? @nikomatsakis

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Aug 24, 2018
Copy link
Contributor

@nikomatsakis nikomatsakis left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice. r=me once travis is happy and post rebase.

/// For each block, bits valid on entry to the block.
on_entry_sets: Bits<E>,
on_entry_sets: Vec<IdxSetBuf<E>>,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

didn't I already review this? Am I just getting confused...

fn new(init: Word, universe_size: usize) -> Self {
let num_words = (universe_size + (BITS_PER_WORD - 1)) / BITS_PER_WORD;
fn new(init: Word, domain_size: usize) -> Self {
let num_words = (domain_size + (BITS_PER_WORD - 1)) / BITS_PER_WORD;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

but this looks new

@nikomatsakis
Copy link
Contributor

@bors r=nnethercote

@bors
Copy link
Contributor

bors commented Aug 24, 2018

📌 Commit f52c0b93e45def9e5c5010f3d90a9156afac4110 has been approved by nnethercote

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Aug 24, 2018
@nikomatsakis
Copy link
Contributor

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Aug 24, 2018
@nikomatsakis
Copy link
Contributor

@bors delegate=nnethercote

@bors
Copy link
Contributor

bors commented Aug 24, 2018

✌️ @nnethercote can now approve this pull request

@nnethercote
Copy link
Contributor Author

Oh, I mismanaged this branch... the first three commits already landed in #53520. It's just the last two commits that are new. Sorry for the confusion.

Because `domain` is a more obvious term than `universe` for this
concept.
They let `union()`, `union_sparse()` and `union_hybrid()` be merged.
Likewise for subtract()`, `subtract_sparse()` and `subtract_hybrid()`.
@nnethercote
Copy link
Contributor Author

@bors r=nikomatsakis

@bors
Copy link
Contributor

bors commented Aug 24, 2018

📌 Commit 626b298 has been approved by nikomatsakis

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 24, 2018
@bors
Copy link
Contributor

bors commented Aug 27, 2018

⌛ Testing commit 626b298 with merge b638d8c...

bors added a commit that referenced this pull request Aug 27, 2018
`HybridIdxSet` tweaks

A couple of tweaks to `HybridIdxSet`.

r? @nikomatsakis
@bors
Copy link
Contributor

bors commented Aug 27, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: nikomatsakis
Pushing b638d8c to master...

@bors bors merged commit 626b298 into rust-lang:master Aug 27, 2018
@nnethercote nnethercote deleted the HybridIdxSet-tweaks branch August 27, 2018 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants