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 8 pull requests #64971

Closed
wants to merge 42 commits into from
Closed

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 12 commits October 1, 2019 15:50
This is needed to dump graphviz results for the `IndirectlyMutableLocals` analysis.
This also tests that `&&[]` no longer causes an ICE in this PR (although
the test fails the borrow checker). This could be more complete.
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
…chievink

Remove unneeded `fn main` blocks from docs

## [No whitespace diff](https://github.com/rust-lang/rust/pull/64912/files?w=1)
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.
Don't mark borrows of zero-sized arrays as indirectly mutable

Resolves rust-lang#64945

r? @oli-obk
@Centril
Copy link
Contributor Author

Centril commented Oct 1, 2019

@bors r+ p=8 rollup=never

@bors
Copy link
Contributor

bors commented Oct 1, 2019

📌 Commit 74586e2 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
@ecstatic-morse
Copy link
Contributor

ecstatic-morse commented Oct 1, 2019

@Centril #64967 didn't get blessed .stderr committed, can you back it out for now.

@Centril Centril closed this Oct 1, 2019
@Centril Centril deleted the rollup-kdhr182 branch October 1, 2019 21:55
@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-10-01T21:58:17.3477123Z ##[command]git remote add origin https://github.com/rust-lang/rust
2019-10-01T21:58:17.3668977Z ##[command]git config gc.auto 0
2019-10-01T21:58:17.3738111Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2019-10-01T21:58:17.3801087Z ##[command]git config --get-all http.proxy
2019-10-01T21:58:17.3938063Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64971/merge:refs/remotes/pull/64971/merge
2019-10-01T21:58:18.1554993Z fatal: couldn't find remote ref refs/pull/64971/merge
2019-10-01T21:58:18.2797771Z ##[warning]Git fetch failed with exit code 128, back off 9.997 seconds before retry.
2019-10-01T21:58:28.1911448Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64971/merge:refs/remotes/pull/64971/merge
2019-10-01T21:58:28.7876234Z fatal: couldn't find remote ref refs/pull/64971/merge
2019-10-01T21:58:28.8395694Z ##[warning]Git fetch failed with exit code 128, back off 1.705 seconds before retry.
2019-10-01T21:58:30.4971691Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/64971/merge:refs/remotes/pull/64971/merge
2019-10-01T21:58:31.1045922Z fatal: couldn't find remote ref refs/pull/64971/merge
2019-10-01T21:58:31.1555504Z ##[error]Git fetch failed with exit code: 128
2019-10-01T21:58:31.1868969Z ##[section]Starting: Checkout
2019-10-01T21:58:31.1870581Z ==============================================================================
2019-10-01T21:58:31.1870636Z Task         : Get sources
2019-10-01T21:58:31.1870688Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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
9 participants