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.

Sign up for GitHub

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

Jump to bottom

Rollup beta backports #56352

Merged
merged 5 commits into from
Nov 30, 2018
Merged

Rollup beta backports #56352

merged 5 commits into from
Nov 30, 2018

Conversation

alexcrichton
Copy link
Member

@alexcrichton alexcrichton commented Nov 29, 2018 •
edited
Loading

petrochenkov and others added 4 commits November 29, 2018 10:28
@petrochenkov @alexcrichton
resolve: Extern prelude is for type namespace only
04032d8
@nikic @alexcrichton
Fix alignment of stores to scalar pair
035198b 
The alignment for the second element of a scalar pair is not the
same as for the first element. Make sure it is computed correctly
based on the element size.
@petrochenkov @alexcrichton
resolve: Fix false-positives from lint `absolute_paths_not_starting_w…
ba9d7de 
…ith_crate`
@eddyb @alexcrichton
rustc_codegen_llvm: don't overalign loads of pair operands.
bf87590
@alexcrichton alexcrichton added this to the Rust 2018 Release milestone Nov 29, 2018
@rust-highfive
Copy link
Collaborator

r? @michaelwoerister

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 29, 2018
This was referenced Nov 29, 2018
Merged
Merged
@alexcrichton
Copy link
Member Author

r? @alexcrichton

@bors: p=100

This was referenced Nov 29, 2018
Closed
Closed
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 29, 2018

📌 Commit bf87590 has been approved by alexcrichton

@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 Nov 29, 2018
@alexcrichton
Copy link
Member Author

@bors: r+

@bors
Copy link
Contributor

bors commented Nov 29, 2018

📌 Commit 9023e94 has been approved by alexcrichton

@alexcrichton alexcrichton mentioned this pull request Nov 29, 2018
Closed
@bors
Copy link
Contributor

bors commented Nov 29, 2018

⌛ Testing commit 9023e94 with merge 2afd60e054348cbd60643cbbb8f5fb76f97e144a...

@bors
Copy link
Contributor

bors commented Nov 30, 2018

💔 Test failed - status-travis

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

The job i686-gnu of your PR failed on Travis (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.

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)

@alexcrichton
Copy link
Member Author

@bors: retry

@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 Nov 30, 2018
@bors
Copy link
Contributor

bors commented Nov 30, 2018

⌛ Testing commit 9023e94 with merge 8940af3...

bors added a commit that referenced this pull request Nov 30, 2018
@bors
Auto merge of #56352 - alexcrichton:beta-next, r=alexcrichton
8940af3 
Rollup beta backports

* #56264
* #56300
* #56322
* #56329

Neither #56300 nor #56329 applied cleanly, but I think I've gotten it working with @nikic's [help](#56300 (comment)) (thanks!)

Closes #56311
Closes #56263
@bors
Copy link
Contributor

bors commented Nov 30, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 8940af3 to beta...

@bors bors merged commit 9023e94 into rust-lang:beta Nov 30, 2018
@alexcrichton alexcrichton deleted the beta-next branch November 30, 2018 04:53
@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
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

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
Milestone
Rust 2018 Release
Development

Successfully merging this pull request may close these issues.
8 participants
@alexcrichton @rust-highfive @bors @Centril @michaelwoerister @petrochenkov @nikic @eddyb