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

Rollup of 7 pull requests #64972

Merged
merged 38 commits into from
Oct 2, 2019
Merged

Rollup of 7 pull requests #64972

merged 38 commits into from
Oct 2, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Oct 1, 2019

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 30 commits August 9, 2019 19:33
So the order matches the order in `CtxtInterners`.
This is a leftover from when there were global and thread-local arenas.
It's only used in two places, and the code is shorter and more readable
with it gone.
ssomers and others added 8 commits October 1, 2019 15:50
BTreeSet intersection, is_subset & difference optimizations

...based on the range of values contained; in particular, a massive improvement when these ranges are disjoint (or merely touching), like in the neg-vs-pos benchmarks already in liballoc. Inspired by rust-lang#64383 but none of the ideas there worked out.

I introduced another variant in IntersectionInner and in DifferenceInner, because I couldn't find a way to initialize these iterators as empty if there's no empty set around.

Also, reduced the size of "large" sets in test cases - if Miri can't handle it, it was needlessly slowing down everyone.
syntax: cleanup param, method, and misc parsing

Do some misc cleanup of the parser:
- Method and parameter parsing is refactored.
- A parser for `const | mut` is introduced that rust-lang#64588 can reuse.
- Some other misc parsing.

Next up in a different PR:
- ~Implementing rust-lang#64252 -- maybe some other time...
- Heavily restructuring up `item.rs` which is a mess (hopefully, no promises ^^).

r? @petrochenkov
Fixes rust-lang#64919. Suggest fix based on operator precendence.

Fixes rust-lang#64919
Add lower bound doctests for `saturating_{add,sub}` signed ints

Closes rust-lang#64940
…arkor,spastorino

Simplify interners

Some code readability improvements.
@Centril
Copy link
Contributor Author

Centril commented Oct 1, 2019

@bors r+ p=7 rollup=never

@bors
Copy link
Contributor

bors commented Oct 1, 2019

📌 Commit adc0dc5 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 1, 2019
@bors
Copy link
Contributor

bors commented Oct 1, 2019

⌛ Testing commit adc0dc5 with merge 7130fc5...

bors added a commit that referenced this pull request Oct 1, 2019
Rollup of 7 pull requests

Successful merges:

 - #63416 (apfloat: improve doc comments)
 - #64820 (BTreeSet intersection, is_subset & difference optimizations)
 - #64910 (syntax: cleanup param, method, and misc parsing)
 - #64912 (Remove unneeded `fn main` blocks from docs)
 - #64933 (Fixes #64919. Suggest fix based on operator precendence.)
 - #64943 (Add lower bound doctests for `saturating_{add,sub}` signed ints)
 - #64950 (Simplify interners)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Oct 2, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing 7130fc5 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 2, 2019
@bors bors merged commit adc0dc5 into rust-lang:master Oct 2, 2019
@Centril Centril deleted the rollup-gcawast branch October 2, 2019 16:24
@Centril Centril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

Suggested fix does not account for operator precedence
7 participants