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

Rollup of 16 pull requests #62192

Merged
merged 45 commits into from
Jun 28, 2019
Merged

Rollup of 16 pull requests #62192

merged 45 commits into from
Jun 28, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jun 27, 2019

Successful merges:

Failed merges:

r? @ghost

RalfJung and others added 30 commits June 15, 2019 23:51
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
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>
Lexer uses Symbols for a lot of stuff, not only for identifiers, so
the "name" terminology is just confusing.
Otherwise it ends up writing the file byte at a time, which can be very slow for large outputs.
We've seen quite a few issues with spurious illegal instructions getting
executed on OSX on CI recently. For whatever reason `cc` itself is
executing an illegal instruction and we're not really getting any other
information about what's happening. Since we're already retrying the
linker when it segfaults, let's just continue to retry everything and
automatically reinvoke the linker when it fails with an illegal instruction.
improve pinning projection docs

This tries to improve the explanation of structural pinning and pinning projections based on [this URLO thread](https://users.rust-lang.org/t/when-is-it-safe-to-move-a-member-value-out-of-a-pinned-future/28182).

Fixes rust-lang#61272.
@bors
Copy link
Contributor

bors commented Jun 27, 2019

📌 Commit 65f1ff4 has been approved by Centril

@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 Jun 27, 2019
@bors
Copy link
Contributor

bors commented Jun 27, 2019

⌛ Testing commit 65f1ff4 with merge 3930c37ad7deab7389fef9060611decfee4be0d8...

@bors
Copy link
Contributor

bors commented Jun 27, 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 Jun 27, 2019
@alexcrichton
Copy link
Member

@bors: retry

Trying to authorize and get the azure build running...

@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 Jun 27, 2019
@bors
Copy link
Contributor

bors commented Jun 28, 2019

⌛ Testing commit 65f1ff4 with merge a07175819cb799371696a43a5a8078520ecf1c65...

@bors
Copy link
Contributor

bors commented Jun 28, 2019

💔 Test failed - checks-travis

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple 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:system_info

Uninstalled oclint to prevent interference with other packages.
If you need oclint, you must explicitly install it.
-e:1:in `read': No such file or directory @ rb_sysopen - /Users/travis/.m2/settings.xml (Errno::ENOENT)
 from -e:1:in `<main>'
mv: rename settings.xml to /Users/travis/.m2/settings.xml: No such file or directory
travis_fold:start:git.checkout
travis_time:start:015b1f7a
$ git clone --depth=2 --branch=auto https://github.com/rust-lang/rust.git rust-lang/rust
---
wry
xmoto
zxing-cpp
==> Downloading https://homebrew.bintray.com/bottles/xz-5.2.4.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/e7/e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880?__gda__=exp=1561691236~hmac=e8333c17e10a70f78d5128aedf56c51bc0d47092deddb899d4c659151c6a1803&response-content-disposition=attachment%3Bfilename%3D%22xz-5.2.4.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1_FvlFOP9Z_VH-0hKeBIKf2Sbs8TjFg4q5V8atqZmJMJBd2X8y3TR9xPB91TnDN2RHfbVieGArEyAJ8WxmCh5C6XrdjfEzMM5mu9NAfbyeL87u-jAdQL_em6jpt9FX1nezKj_m_i-QOOg&response-X-Checksum-Sha1=32dc0b28e61f32b40c20e2993418aa8cb6e746d5&response-X-Checksum-Sha2=e7be50f4ee00e35887f3957263334eb3baba59e8c061919060f9259351be6880
🍺  /usr/local/Cellar/xz/5.2.4: 92 files, 1MB
==> `brew cleanup` has not been run in 30 days, running now...
Removing: /Users/travis/Library/Caches/Homebrew/boost-1.66.0.high_sierra.bottle.tar.gz... (84.6MB)
Removing: /Users/travis/Library/Caches/Homebrew/carthage-0.28.0.high_sierra.bottle.tar.gz... (8.3MB)
---
Pruned 0 symbolic links and 5 directories from /usr/local
==> Installing dependencies for swig@3: pcre
==> Installing swig@3 dependency: pcre
==> Downloading https://homebrew.bintray.com/bottles/pcre-8.43.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/03/0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861?__gda__=exp=1561691248~hmac=ae4b7e625e514c046b113b17afe76aa992ca3d3581d72e4c1e4125bdd6e38c32&response-content-disposition=attachment%3Bfilename%3D%22pcre-8.43.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX1-t5_ERrugC-1De6yzyk1mCfALSuc9wY0oaXWAK5d3-Kvc5cJQe9JKyvTdw7lyH-2Rq-hk9hCNjR1MIGG-TEFFJ70KmmhRcjn14-ZE42FYQe8Uc8QF3LwCfNzPiwumqN0itlajcQR7ITg&response-X-Checksum-Sha1=c67d4b99bb245f0ea56b34118dd6325b06a7250c&response-X-Checksum-Sha2=0389911a93a88efd4a69b52dea8ecb872fdb55bcfff45d2f7313be5f79730861
🍺  /usr/local/Cellar/pcre/8.43: 204 files, 5.5MB
==> Installing swig@3
==> Downloading https://homebrew.bintray.com/bottles/swig@3-3.0.12.high_sierra.bottle.tar.gz
==> Downloading https://homebrew.bintray.com/bottles/swig@3-3.0.12.high_sierra.bottle.tar.gz
==> Downloading from https://akamai.bintray.com/73/730bd728981cc1534664ef35d08d0b285e79756c286913d868af6afa43f60f4d?__gda__=exp=1561691250~hmac=bd027cf10f40d6e3cea2c0091331af5d64a8e3e34fa90279905f7b774d364313&response-content-disposition=attachment%3Bfilename%3D%22swig%403-3.0.12.high_sierra.bottle.tar.gz%22&response-content-type=application%2Fgzip&requestInfo=U2FsdGVkX19DzERH-IWtSUzWhEc1QD42CuPsCYtRVehSaTkYoYos3A14YZM1Avjt_B-EP9Y0dPwVsofIwAloyAxUrAD2xkvqj_6uLLGGh4FTZoujpcTlqcnrZaAy-eqsFcX-mKABgfPZYNim4MyV8Q&response-X-Checksum-Sha1=4dc415ab888a7792f289543bafff9d4ec27cebb3&response-X-Checksum-Sha2=730bd728981cc1534664ef35d08d0b285e79756c286913d868af6afa43f60f4d
==> Caveats
swig@3 is keg-only, which means it was not symlinked into /usr/local,
because this is an alternate version of another formula.
If you need to have swig@3 first in your PATH run:
---
[00:01:51]    Compiling serde_derive v1.0.81
[00:02:18]    Compiling toml v0.4.10
[00:02:18]    Compiling serde_json v1.0.33
[00:02:23]    Compiling bootstrap v0.0.0 (/Users/travis/build/rust-lang/rust/src/bootstrap)
No output has been received in the last 30m0s, this potentially indicates a stalled build or something wrong with the build itself.
Check the details on how to adjust your build configuration on: https://docs.travis-ci.com/user/common-build-problems/#Build-times-out-because-no-output-was-received
The build 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)

@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 Jun 28, 2019
@Centril
Copy link
Contributor Author

Centril commented Jun 28, 2019

@bors retry 30m0s

@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 Jun 28, 2019
@bors
Copy link
Contributor

bors commented Jun 28, 2019

⌛ Testing commit 65f1ff4 with merge 433a467...

bors added a commit that referenced this pull request Jun 28, 2019
Rollup of 16 pull requests

Successful merges:

 - #61878 (improve pinning projection docs)
 - #62043 (Remove `FnBox`)
 - #62067 (Add suggestion for missing `.await` keyword)
 - #62076 (Updated RELEASES.md for 1.36.0)
 - #62102 (call out explicitly that general read needs to be called with an initialized buffer)
 - #62106 (Add more tests for async/await)
 - #62124 (refactor lexer to use idiomatic borrowing)
 - #62131 (libsyntax: Fix some Clippy warnings)
 - #62152 (Don't ICE on item in `.await` expression)
 - #62154 (Remove old fixme)
 - #62155 (Add regression test for MIR drop generation in async loops)
 - #62156 (Update books)
 - #62160 (Remove outdated question_mark_macro_sep lint)
 - #62164 (save-analysis: use buffered writes)
 - #62171 (rustc: Retry SIGILL linker invocations)
 - #62176 (Update RLS)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jun 28, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: Centril
Pushing 433a467 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 28, 2019
@bors bors merged commit 65f1ff4 into rust-lang:master Jun 28, 2019
@Centril Centril deleted the rollup-kssnlta branch June 28, 2019 17:35
@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.