Rollup of 12 pull requests#67648
Closed
Mark-Simulacrum wants to merge 77 commits intorust-lang:masterfrom
Closed
Conversation
Refactor expression parsing thoroughly Based on rust-lang#66994 together with which this has refactored basically the entirety of `expr.rs`. r? @estebank
…varkor Various const eval and pattern matching ICE fixes r? @RalfJung cc @spastorino This PR does not change existing behaviour anymore and just fixes a bunch of ICEs reachable from user code (sometimes even on stable via obscure union transmutes).
…, r=estebank typeck: note other end-point when checking range pats Fixes rust-lang#57389, alternative to rust-lang#67214 that should be less invasive to type checking logic. r? @estebank
prune ill-conceived BTreeMap iter_mut assertion and test its mutability Proposal to deal with rust-lang#67438 (and I'm more sure now that this is the right thing to do). Passes testing with miri.
reuse `capacity` variable in slice::repeat None
…-intrinsics, r=Centril Use issue = "none" instead of "0" in intrinsics `issue = "0"` was incorrectly used in rust-lang@9ee16e1, the project is moving away from issue 0
…=Zoxc Set callbacks globally This sets the callbacks from syntax and rustc_errors just once, utilizing static (rather than thread-local) storage.
…docs, r=Dylan-DPC Remove `compiler_builtins_lib` documentation Fixes rust-lang#67593
…r=steveklabnik Remove redundant link texts Most of these links are followed by a parenthesized expression. I think that the redundant link texts were added to prevent interpretation as an inline link. This is unnecessary since the closing square bracket and opening parenthesis are separated by whitespace.
…nks, r=steveklabnik Convert collapsed to shortcut reference links
…ulacrum Update .mailmap
…dtolnay Document safety of Path casting I would personally feel more comfortable making the relevant (internal anyway) types repr(transparent) and then documenting that we can make these casts because of that, but I believe this is a more minimal PR, so posting it first. Resolves rust-lang#45910.
Member
Author
|
@bors r+ p=5 |
Collaborator
|
📌 Commit bcb7553 has been approved by |
bors
added
the
S-waiting-on-bors
Collaborator
bors
added a commit
that referenced
this pull request
Dec 26, 2019
Rollup of 12 pull requests Successful merges: - #67112 (Refactor expression parsing thoroughly) - #67192 (Various const eval and pattern matching ICE fixes) - #67287 (typeck: note other end-point when checking range pats) - #67459 (prune ill-conceived BTreeMap iter_mut assertion and test its mutability) - #67576 (reuse `capacity` variable in slice::repeat) - #67602 (Use issue = "none" instead of "0" in intrinsics) - #67614 (Set callbacks globally) - #67617 (Remove `compiler_builtins_lib` documentation) - #67629 (Remove redundant link texts) - #67632 (Convert collapsed to shortcut reference links) - #67633 (Update .mailmap) - #67635 (Document safety of Path casting) Failed merges: r? @ghost
Contributor
retry? |
Contributor
|
No, do not retry. |
Member
Author
|
That's in the PR builder which ultimately doesn't matter AFAICT. |
This comment has been minimized.
This comment has been minimized.
Contributor
|
The job Click to expand the log.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 |
Collaborator
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #66936) made this pull request unmergeable. Please resolve the merge conflicts. |
Contributor
|
#67287 causes a conflict. |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
11 participants
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.
Successful merges:
capacityvariable in slice::repeat #67576 (reusecapacityvariable in slice::repeat)compiler_builtins_libdocumentation #67617 (Removecompiler_builtins_libdocumentation)Failed merges:
r? @ghost