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

Really make CGU names unique across crates. #54152

Merged
merged 1 commit into from
Sep 12, 2018

Conversation

michaelwoerister
Copy link
Member

This will hopefully fix issue #53794.

r? @alexcrichton

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 12, 2018
@michaelwoerister
Copy link
Member Author

cc @cramertj

@michaelwoerister
Copy link
Member Author

This should be backported if it doesn't make it into beta this week.

@alexcrichton
Copy link
Member

@bors: r+ p=1

@bors
Copy link
Contributor

bors commented Sep 12, 2018

📌 Commit 3beb762 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 Sep 12, 2018
@bors
Copy link
Contributor

bors commented Sep 12, 2018

⌛ Testing commit 3beb762 with merge 11ee03e536de2d77cfc79ddf9ee02bade6eab4fb...

@bors
Copy link
Contributor

bors commented Sep 12, 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 Sep 12, 2018
@rust-highfive
Copy link
Collaborator

The job dist-powerpc64-linux 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.
travis_fold:end:step_upload_script
travis_fold:start:worker_info
Worker information
hostname: ba9ce31d-7747-4a0e-94dd-a9be3668215c@1.production-4-worker-org-a-1-gce
version: v4.1.0-17-g600200d https://github.com/travis-ci/worker/tree/600200deddbb9114004580ec8d6dd7b4722840d9
startup: 6.244799534s
travis_fold:end:worker_info
travis_fold:start:system_info
Build system information
---
[00:48:35] [RUSTC-TIMING] memmap test:false 0.972
[00:48:37] [RUSTC-TIMING] cc test:false 11.154
[00:48:37]    Compiling rustc_llvm v0.0.0 (file:///checkout/src/librustc_llvm)
[00:48:41] [RUSTC-TIMING] rustc_llvm test:false 0.248
The job exceeded the maximum time limit for jobs, and has been terminated.

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

@bors: retry

thanks travis :(

@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 Sep 12, 2018
@bors
Copy link
Contributor

bors commented Sep 12, 2018

⌛ Testing commit 3beb762 with merge 06d2448...

bors added a commit that referenced this pull request Sep 12, 2018
Really make CGU names unique across crates.

This will hopefully fix issue #53794.

r? @alexcrichton
@bors
Copy link
Contributor

bors commented Sep 12, 2018

☀️ Test successful - status-appveyor, status-travis
Approved by: alexcrichton
Pushing 06d2448 to master...

@bors bors merged commit 3beb762 into rust-lang:master Sep 12, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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.

4 participants