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

[stable] Emergency stable backports #62311

Merged
merged 3 commits into from
Jul 3, 2019
Merged

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jul 2, 2019

No description provided.

XAMPPRocky and others added 3 commits July 2, 2019 10:27
Co-Authored-By: Taiki Endo <te316e89@gmail.com>
Co-Authored-By: Jonas Schievink <jonasschievink@gmail.com>
Co-Authored-By: Torbjørn Birch Moltu <t.b.moltu@lyse.net>
Fixes rust-lang#62301, a regression in 1.36.0 which was caused by hashbrown using `NonZero<T>` where the older hashmap used `Unique<T>`.
@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. 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 Jul 2, 2019
@Mark-Simulacrum
Copy link
Member Author

We include these for the compatibility notes:

as well as the HashMap fix #62304

@Centril
Copy link
Contributor

Centril commented Jul 2, 2019

r? @Centril

@bors r+ p=2000

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit 3e9fc8c has been approved by Centril

@rust-highfive rust-highfive assigned Centril and unassigned alexcrichton Jul 2, 2019
@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 Jul 2, 2019
@bors
Copy link
Contributor

bors commented Jul 2, 2019

⌛ Testing commit 3e9fc8c with merge 4c02595...

bors added a commit that referenced this pull request Jul 2, 2019
@Centril
Copy link
Contributor

Centril commented Jul 2, 2019

Reminder: Please include 126be2c in master~>beta promotion and when we bump the bootstrap compiler on master.

@Mark-Simulacrum
Copy link
Member Author

fyi: we're going to punt this to tomorrow morning most likely due to the current travis outage; https://www.traviscistatus.com/incidents/g9xm3l02dknv

@bors retry to cede this to some other builder

@bors
Copy link
Contributor

bors commented Jul 2, 2019

⌛ Testing commit 3e9fc8c with merge 155a7cbb25815e207f861efe820b5ea6db86c029...

@Mark-Simulacrum
Copy link
Member Author

@bors retry r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. 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-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 2, 2019
@rust-highfive
Copy link
Collaborator

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)

@Mark-Simulacrum
Copy link
Member Author

Travis claims backlog has cleared on .com, so let's try this again.

@bors r+

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit 3e9fc8c has been approved by Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jul 2, 2019

⌛ Testing commit 3e9fc8c with merge 5a017a8c98d1cd7c507e5bf3c947ef677a4c2a75...

@bors
Copy link
Contributor

bors commented Jul 3, 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 Jul 3, 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.
/usr/local/lib/python2.7/dist-packages/pip/_vendor/requests/__init__.py:83: RequestsDependencyWarning: Old version of cryptography ([1, 2, 3]) may cause slowdown.
  warnings.warn(warning, RequestsDependencyWarning)
DEPRECATION: Python 2.7 will reach the end of its life on January 1st, 2020. Please upgrade your Python as Python 2.7 won't be maintained after that date. A future version of pip will drop support for Python 2.7.
Collecting awscli
  Downloading https://files.pythonhosted.org/packages/34/ee/7e6fd1bcae45bd8468b6f6c76d213216a2eacfa4102a77a2467f05afbc11/awscli-1.16.192-py2.py3-none-any.whl (1.7MB)
  Downloading https://files.pythonhosted.org/packages/16/8a/1fc3dba0c4923c2a76e1ff0d52b305c44606da63f718d14d3231e21c51b0/s3transfer-0.2.1-py2.py3-none-any.whl (70kB)
Collecting docutils>=0.10 (from awscli)
  Downloading https://files.pythonhosted.org/packages/50/09/c53398e0005b11f7ffb27b7aa720c617aba53be4fb4f4f3f06b9b5c60f28/docutils-0.14-py2-none-any.whl (543kB)
Collecting botocore==1.12.182 (from awscli)
---
[01:51:34] test string::test_str_truncate ... ok
[01:51:34] test string::test_str_truncate_invalid_len ... ok
[01:51:34] test string::test_str_truncate_split_codepoint ... ok
[01:51:34] test str::test_unsafe_slice ... ok
[01:51:35] died due to signal 11
[01:51:35] 
[01:51:35] 
[01:51:35] 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:51:35] expected success, got: exit code: 3
---
travis_time:end:23cfd5dc:start=1562117240233897018,finish=1562117240244961780,duration=11064762
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:133b9b61
$ 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:10c09f20
travis_time:start:10c09f20
$ 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:1b99b3ee
$ 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)

@Mark-Simulacrum
Copy link
Member Author

@bors retry android spurious test failure

@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 Jul 3, 2019
@bors
Copy link
Contributor

bors commented Jul 3, 2019

⌛ Testing commit 3e9fc8c with merge 67c727ce5fb31ea7da1d8156da1e8609f7691c38...

@bors
Copy link
Contributor

bors commented Jul 3, 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 Jul 3, 2019
@pietroalbini
Copy link
Member

@bors retry -- rls spurious failure

@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 Jul 3, 2019
@bors
Copy link
Contributor

bors commented Jul 3, 2019

⌛ Testing commit 3e9fc8c with merge a53f9df...

bors added a commit that referenced this pull request Jul 3, 2019
@bors
Copy link
Contributor

bors commented Jul 3, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Mark-Simulacrum
Pushing a53f9df to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 3, 2019
@bors bors merged commit 3e9fc8c into rust-lang:stable Jul 3, 2019
@Mark-Simulacrum Mark-Simulacrum deleted the stable-next branch July 3, 2019 10:58
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. 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.

8 participants