Skip to content

Rollup of 8 pull requests - #59966

Closed
Centril wants to merge 25 commits into
rust-lang:masterfrom
Centril:rollup-hd8vobi
Closed

Rollup of 8 pull requests#59966
Centril wants to merge 25 commits into
rust-lang:masterfrom
Centril:rollup-hd8vobi

Conversation

@Centril

Copy link
Copy Markdown
Contributor

Successful merges:

Failed merges:

r? @ghost

Albin Stjernaand others added 25 commits April 10, 2019 22:44
…lementation
get_mut allows us to abstract over the implementation detail of inner being
optional.
Use a proc macro to declare preallocated symbols
r? @petrochenkov
update polonius-engine
This updates polonius-engine to [version 0.7.0](https://github.com/rust-lang/polonius/blob/master/RELEASES.md#v070), which adds a hybrid algorithm that starts off with performing a cheaper, location-insensitive analysis before proceeding with the full analysis.
r? @nikomatsakis
…in-pin-docs, r=RalfJung
Remove [mut] syntax in pin docs
Resolvesrust-lang#59832
…nnytm
Make BufWriter use get_mut instead of manipulating inner in Write implementation
`get_mut` allows us to abstract over the implementation detail of inner being optional.
Fix cross-crate visibility of fictive variant constructors
After merging rust-lang#59376 I realized that the code in the decoder wasn't entirely correct - we "decoded" fictive variant constructors with their variant's visibility, which could be public, rather than demoted to `pub(crate)`.
Fictive constructors are not directly usable in expression/patterns, but the effect still can be observed with imports.
r? @davidtwco
…ievink
Add missing backtick to Symbol documentation.
@Centril

Copy link
Copy Markdown
ContributorAuthor

@bors r+ p=8

@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit 39b6086 has been approved by Centril

@borsbors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 14, 2019
@bors

bors commented Apr 14, 2019

Copy link
Copy Markdown
Collaborator

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

  1. git checkout rollup-hd8vobi(switch to your branch)
  2. git fetch upstream master(retrieve the latest master)
  3. git rebase upstream/master -p(rebase on top of it)
  4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
  5. git push self rollup-hd8vobi --force-with-lease(update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message
warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

@borsbors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Apr 14, 2019
@borsbors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Apr 14, 2019
@CentrilCentril closed this Apr 14, 2019
@Centril
Centril deleted the rollup-hd8vobi branch April 14, 2019 15:49
@CentrilCentril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollupA PR which is a rollupS-waiting-on-authorStatus: This is awaiting some action (such as code changes or more information) from the author.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

8 participants

@Centril@bors@estebank@czipperz@Zoxc@ljedrz@petrochenkov@krk