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

[beta] Rollup backports #61283

Merged
merged 6 commits into from
May 29, 2019
Merged

[beta] Rollup backports #61283

merged 6 commits into from
May 29, 2019

Conversation

pietroalbini
Copy link
Member

@pietroalbini pietroalbini commented May 28, 2019

Rolled up:

Cherry-picked:

r? @ghost

@pietroalbini
Copy link
Member Author

@bors r+ p=20

@bors
Copy link
Contributor

bors commented May 28, 2019

📌 Commit 242de1cbc8ed092631b0c2931005e8236e7e9b82 has been approved by pietroalbini

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label May 28, 2019
@pietroalbini
Copy link
Member Author

@bors r-

A PR had wrong labels, I'll add it.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 28, 2019
@ehuss
Copy link
Contributor

ehuss commented May 28, 2019

I don't think #61110 should be included without #61098. I suspect it won't pass tests without it.

rust-lang@cff075009 made LLVM emit
less debuginfo when compiling with "line-tables-only". The change
was essentially correct but the reduced amount of debuginfo broke
a number of tools.

This commit reverts the change so we get back the old behavior,
until we figure out how to do this properly and give external
tools to adapt to the new format.

See rust-lang#60020 for more info.
@pietroalbini
Copy link
Member Author

@ehuss that's a really good point.

Removed #61110, added #61007.

@bors r+ p=20

@bors
Copy link
Contributor

bors commented May 28, 2019

📌 Commit 4f22a66 has been approved by pietroalbini

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 28, 2019
@bors
Copy link
Contributor

bors commented May 28, 2019

⌛ Testing commit 4f22a66 with merge c3ffeea353cef7cab8ed31a9f55de31e63a892ac...

@bors
Copy link
Contributor

bors commented May 28, 2019

💔 Test failed - status-appveyor

@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 May 28, 2019
@ehuss
Copy link
Contributor

ehuss commented May 29, 2019

I have filed rust-lang/rls#1466 for the flakey rls error since I've personally seen it happen multiple times.

@pietroalbini
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 May 29, 2019
@bors
Copy link
Contributor

bors commented May 29, 2019

⌛ Testing commit 4f22a66 with merge 70d3e4e53d0b1389050083735af5123778296fc2...

@bors
Copy link
Contributor

bors commented May 29, 2019

💔 Test failed - checks-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 May 29, 2019
@rust-highfive
Copy link
Collaborator

The job arm-android 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.
[01:40:22] test string::test_str_clear ... ok
[01:40:22] test string::test_str_truncate ... ok
[01:40:22] test string::test_str_truncate_invalid_len ... ok
[01:40:22] test string::test_str_truncate_split_codepoint ... ok
[01:40:22] died due to signal 11
[01:40:22] 
[01:40:22] 
[01:40:22] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "arm-linux-androideabi" "-j" "4" "--release" "--locked" "--color" "always" "--features" "panic-unwind backtrace" "--manifest-path" "/checkout/src/libstd/Cargo.toml" "-p" "alloc" "--"
[01:40:22] expected success, got: exit code: 3
---
travis_time:end:0623e032:start=1559132479719264653,finish=1559132479733880604,duration=14615951
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:000789b0
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:247157b5
travis_time:start:247157b5
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:0d84b2a4
$ dmesg | grep -i kill

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)

@pietroalbini
Copy link
Member Author

@bors retry

Android signal 11.

@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 May 29, 2019
@bors
Copy link
Contributor

bors commented May 29, 2019

⌛ Testing commit 4f22a66 with merge 0ff088c...

bors added a commit that referenced this pull request May 29, 2019
[beta] Rollup backports

Rolled up:

* [beta] adjust deprecation date of mem::uninitialized #61160

Cherry-picked:

* Fix ICE with inconsistent macro matchers #61046
* Revert "Add implementations of last in terms of next_back on a bunch of DoubleEndedIterators." #61057
* debuginfo: Revert to old/more verbose behavior for -Cdebuginfo=1 #61007

r? @ghost
@bors
Copy link
Contributor

bors commented May 29, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pietroalbini
Pushing 0ff088c to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 29, 2019
@bors bors merged commit 4f22a66 into rust-lang:beta May 29, 2019
@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
Labels
merged-by-bors This PR was explicitly merged by bors. 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
Development

Successfully merging this pull request may close these issues.

9 participants