Skip to content

Rollup beta backports - #56352

Merged
bors merged 5 commits into
rust-lang:betafrom
alexcrichton:beta-next
Nov 30, 2018
Merged

Rollup beta backports#56352
bors merged 5 commits into
rust-lang:betafrom
alexcrichton:beta-next

Conversation

@alexcrichton

@alexcrichtonalexcrichton commented Nov 29, 2018•
edited
Loading

Copy link
Copy Markdown
Member

petrochenkovand 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
@alexcrichtonalexcrichton added this to the Rust 2018 Release milestone Nov 29, 2018
@rust-highfive

rust-highfive commented Nov 29, 2018

Copy link
Copy Markdown
Contributor

r? @michaelwoerister

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

@rust-highfive

rust-highfive commented Nov 29, 2018

Copy link
Copy Markdown
Contributor

⚠️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-highfiverust-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

alexcrichton commented Nov 29, 2018

Copy link
Copy Markdown
MemberAuthor

r? @alexcrichton

@bors: p=100

This was referenced Nov 29, 2018
Closed
Closed
@alexcrichton

alexcrichton commented Nov 29, 2018

Copy link
Copy Markdown
MemberAuthor

@bors: r+

@bors

bors commented Nov 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit bf87590 has been approved by alexcrichton

@borsbors 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

alexcrichton commented Nov 29, 2018

Copy link
Copy Markdown
MemberAuthor

@bors: r+

@bors

bors commented Nov 29, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 9023e94 has been approved by alexcrichton

@alexcrichtonalexcrichton mentioned this pull request Nov 29, 2018
Closed
@bors

bors commented Nov 29, 2018

Copy link
Copy Markdown
Collaborator

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

@bors

bors commented Nov 30, 2018

Copy link
Copy Markdown
Collaborator

💔 Test failed - status-travis

@borsbors 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

rust-highfive commented Nov 30, 2018

Copy link
Copy Markdown
Contributor

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

alexcrichton commented Nov 30, 2018

Copy link
Copy Markdown
MemberAuthor

@bors: retry

@borsbors 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

bors commented Nov 30, 2018

Copy link
Copy Markdown
Collaborator

⌛ 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#56311Closes#56263
@bors

bors commented Nov 30, 2018

Copy link
Copy Markdown
Collaborator

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

@bors
bors merged commit 9023e94 into rust-lang:betaNov 30, 2018
@alexcrichton
alexcrichton deleted the beta-next branch November 30, 2018 04:53
@CentrilCentril added the rollup A PR which is a rollup label Oct 2, 2019
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@alexcrichtonalexcrichton

Labels

rollupA PR which is a rollupS-waiting-on-borsStatus: 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