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.

Sign up for GitHub

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

Jump to bottom

Rollup of 6 pull requests #67310

Merged
merged 12 commits into from
Dec 15, 2019
Merged

Rollup of 6 pull requests #67310

merged 12 commits into from
Dec 15, 2019

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Dec 15, 2019

Successful merges:

Failed merges:

r? @ghost

tuxillo and others added 12 commits December 12, 2019 17:26
@tuxillo
Remove i686-unknown-dragonfly target
0f47327
@alexcrichton
Fix signature of __wasilibc_find_relpath
641ccd5 
Looks like this function changed upstream, so it needs to be adjusted
for when used by libstd.
@pjw91
Fix incorrect example code of OpenOptions::open
b65c6ec
@aloucks
Restore original implementation of Vec::retain
7ea6c46 
This PR reverts rust-lang#48065, which aimed to optimize `Vec::retain` by
making use of `Vec::drain_filter`. Unfortunately at that time,
`drain_filter` was unsound.

The soundness hole in `Vec::drain_filter` was fixed in rust-lang#61224 by
guaranteeing that cleanup logic runs via a nested `Drop`, even in
the event of a panic. Implementing this nested drop affects codegen
(apparently?) and results in slower code.

Fixes rust-lang#65970
@estebank
Do not ICE on unnamed future
e08944f
@kappa
Doc typo
d0008ba
@Centril
Rollup merge of rust-lang#67255 - tuxillo:remove-i686-unknown-dragonf…
009585a 
…ly, r=alexcrichton

Remove i686-unknown-dragonfly target

DragonFly BSD removed support for i386 a while ago. It only supports x86_64 right now.
@Centril
Rollup merge of rust-lang#67267 - alexcrichton:update-wasi-libc, r=Dy…
39c5d81 
…lan-DPC

Fix signature of `__wasilibc_find_relpath`

Looks like this function changed upstream, so it needs to be adjusted
for when used by libstd.
@Centril
Rollup merge of rust-lang#67282 - pjw91:patch-1, r=Dylan-DPC
541dc62 
Fix example code of OpenOptions::open

The example didn't set the access mode flag, which resulted in an `Err(InvalidInput)`.

r? @steveklabnik
@Centril
Rollup merge of rust-lang#67289 - estebank:unnamed-closure, r=Centril
8e2689c 
Do not ICE on unnamed future

Fix rust-lang#67252.
@Centril
Rollup merge of rust-lang#67300 - aloucks:issue-65970, r=rkruppe
64f8391 
Restore original implementation of Vec::retain

This PR reverts rust-lang#48065, which aimed to optimize `Vec::retain` by making use of `Vec::drain_filter`. Unfortunately at that time, `drain_filter` was unsound.

The soundness hole in `Vec::drain_filter` was fixed in rust-lang#61224 by guaranteeing that cleanup logic runs via a nested `Drop`, even in the event of a panic. Implementing this nested drop affects codegen (apparently?) and results in slower code.

Fixes rust-lang#65970
@Centril
Rollup merge of rust-lang#67305 - kappa:patch-1, r=jonas-schievink
e5c3441 
Doc typo
@Centril
Copy link
Contributor Author

Centril commented Dec 15, 2019

@bors r+ p=6 rollup=never

@bors
Copy link
Contributor

bors commented Dec 15, 2019

📌 Commit e5c3441 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 Dec 15, 2019
@Centril Centril added the rollup A PR which is a rollup label Dec 15, 2019
@bors
Copy link
Contributor

bors commented Dec 15, 2019

⌛ Testing commit e5c3441 with merge b194600eb3879f4ddbf0c3c33b1a6df8ff0dca96...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, 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. 
2019-12-15T05:02:03.4301823Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-15T05:02:03.4303875Z 
2019-12-15T05:02:03.4305629Z   git checkout -b <new-branch-name>
2019-12-15T05:02:03.4468669Z 
2019-12-15T05:02:03.4469766Z HEAD is now at b194600eb Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
2019-12-15T05:02:03.4692683Z ##[section]Starting: Setup environment
2019-12-15T05:02:03.4799856Z ==============================================================================
2019-12-15T05:02:03.4799966Z Task         : Bash
2019-12-15T05:02:03.4800061Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-15T05:02:05.1283076Z BUILD_SOURCEBRANCHNAME=auto
2019-12-15T05:02:05.1283140Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-12-15T05:02:05.1283473Z BUILD_SOURCEVERSION=b194600eb3879f4ddbf0c3c33b1a6df8ff0dca96
2019-12-15T05:02:05.1283551Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-12-15T05:02:05.1283843Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
2019-12-15T05:02:05.1284028Z CI_JOB_NAME=i686-msvc-1
2019-12-15T05:02:05.1284120Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-12-15T05:02:05.1284205Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-12-15T05:02:05.1284311Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-12-15T05:03:55.4541043Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-15T05:03:55.4541126Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-15T05:03:55.4545346Z 
2019-12-15T05:03:55.4550286Z Failures
2019-12-15T05:03:55.4556957Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-12-15T05:03:55.4557126Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-12-15T05:03:55.4570377Z Enjoy using Chocolatey? Explore more amazing features to take your
2019-12-15T05:03:55.4570450Z experience to the next level at
2019-12-15T05:03:55.4570546Z  https://chocolatey.org/compare
2019-12-15T05:03:56.0280040Z 
2019-12-15T05:03:56.0280040Z 
2019-12-15T05:03:56.0365214Z ##[error]Bash exited with code '1'.
2019-12-15T05:03:56.0492205Z ##[section]Starting: Checkout
2019-12-15T05:03:56.0600195Z ==============================================================================
2019-12-15T05:03:56.0600290Z Task         : Get sources
2019-12-15T05:03:56.0600361Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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
Copy link
Contributor

bors commented Dec 15, 2019

💔 Test failed - checks-azure

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

Centril commented Dec 15, 2019

@bors retry and-so-it-beings-with-the-spurious-stuff p=2000

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

Centril commented Dec 15, 2019

Let's try again, @bors p=2000

@bors
Copy link
Contributor

bors commented Dec 15, 2019

⌛ Testing commit e5c3441 with merge 83044ce9aa535c9ff051ba5092f2e11d32a58dc7...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, 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. 
2019-12-15T05:22:38.9578725Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-15T05:22:38.9579728Z 
2019-12-15T05:22:38.9586441Z   git checkout -b <new-branch-name>
2019-12-15T05:22:38.9586881Z 
2019-12-15T05:22:38.9591532Z HEAD is now at 83044ce9a Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
2019-12-15T05:22:38.9963081Z ##[section]Starting: Setup environment
2019-12-15T05:22:39.0062773Z ==============================================================================
2019-12-15T05:22:39.0062869Z Task         : Bash
2019-12-15T05:22:39.0062933Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-15T05:22:40.5921216Z BUILD_SOURCEBRANCHNAME=auto
2019-12-15T05:22:40.5921277Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-12-15T05:22:40.5921366Z BUILD_SOURCEVERSION=83044ce9aa535c9ff051ba5092f2e11d32a58dc7
2019-12-15T05:22:40.5921440Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-12-15T05:22:40.5921535Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
2019-12-15T05:22:40.5921699Z CI_JOB_NAME=x86_64-mingw-1
2019-12-15T05:22:40.5921776Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-12-15T05:22:40.5921845Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-12-15T05:22:40.5921938Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-12-15T05:22:52.7661338Z Chocolatey v0.10.15
2019-12-15T05:23:39.9608459Z Installing the following packages:
2019-12-15T05:23:39.9612215Z msys2
2019-12-15T05:23:39.9616465Z By installing you accept licenses for the packages.
2019-12-15T05:25:20.7226503Z Error retrieving packages from source 'https://chocolatey.org/api/v2/':
2019-12-15T05:25:21.6868374Z  Could not connect to the feed specified at 'https://chocolatey.org/api/v2/'. Please verify that the package source (located in the Package Manager Settings) is valid and ensure your network connectivity.
2019-12-15T05:25:21.6870036Z msys2 not installed. The package was not found with the source(s) listed.
2019-12-15T05:25:21.6870275Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-15T05:25:21.6870482Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-15T05:25:21.6870708Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-15T05:25:21.6871070Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-15T05:25:21.6871261Z  assistance.
2019-12-15T05:25:21.6871386Z 
2019-12-15T05:25:21.6871580Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-15T05:25:21.6871580Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-15T05:25:21.6871760Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-15T05:25:21.6871925Z 
2019-12-15T05:25:21.6872072Z Failures
2019-12-15T05:25:21.6872276Z  - msys2 - msys2 not installed. The package was not found with the source(s) listed.
2019-12-15T05:25:21.6872461Z  Source(s): 'https://chocolatey.org/api/v2/'
2019-12-15T05:25:21.6872690Z  NOTE: When you specify explicit sources, it overrides default sources.
2019-12-15T05:25:21.6872902Z If the package version is a prerelease and you didn't specify `--pre`,
2019-12-15T05:25:21.6873270Z Please see https://chocolatey.org/docs/troubleshooting for more 
2019-12-15T05:25:21.6873454Z  assistance.
2019-12-15T05:25:21.6873577Z 
2019-12-15T05:25:21.6873577Z 
2019-12-15T05:25:21.6928229Z ##[error]Bash exited with code '1'.
2019-12-15T05:25:21.7046552Z ##[section]Starting: Checkout
2019-12-15T05:25:21.7157976Z ==============================================================================
2019-12-15T05:25:21.7158084Z Task         : Get sources
2019-12-15T05:25:21.7158164Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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
Copy link
Contributor

bors commented Dec 15, 2019

💔 Test failed - checks-azure

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

Centril commented Dec 15, 2019

@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 Dec 15, 2019
@bors
Copy link
Contributor

bors commented Dec 15, 2019

⌛ Testing commit e5c3441 with merge 4fcb0c958c5cefb5f2839841046beaff33ba7218...

@rust-highfive
Copy link
Collaborator

Your PR failed (pretty log, 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. 
2019-12-15T06:26:46.3367747Z do so (now or later) by using -b with the checkout command again. Example:
2019-12-15T06:26:46.3368818Z 
2019-12-15T06:26:46.3368962Z   git checkout -b <new-branch-name>
2019-12-15T06:26:46.3369678Z 
2019-12-15T06:26:46.3370344Z HEAD is now at 4fcb0c958 Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
2019-12-15T06:26:46.3814363Z ##[section]Starting: Setup environment
2019-12-15T06:26:46.3910234Z ==============================================================================
2019-12-15T06:26:46.3910327Z Task         : Bash
2019-12-15T06:26:46.3910418Z Description  : Run a Bash script on macOS, Linux, or Windows
---
2019-12-15T06:26:48.1229400Z BUILD_SOURCEBRANCHNAME=auto
2019-12-15T06:26:48.1229487Z BUILD_SOURCESDIRECTORY=D:\a\1\s
2019-12-15T06:26:48.1229589Z BUILD_SOURCEVERSION=4fcb0c958c5cefb5f2839841046beaff33ba7218
2019-12-15T06:26:48.1229669Z BUILD_SOURCEVERSIONAUTHOR=bors
2019-12-15T06:26:48.1229784Z BUILD_SOURCEVERSIONMESSAGE=Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
2019-12-15T06:26:48.1229970Z CI_JOB_NAME=i686-mingw-2
2019-12-15T06:26:48.1230042Z COBERTURA_HOME=C:\cobertura-2.1.1
2019-12-15T06:26:48.1230138Z COMMONPROGRAMFILES=C:\Program Files\Common Files
2019-12-15T06:26:48.1230238Z COMMON_TESTRESULTSDIRECTORY=D:\a\1\TestResults
---
2019-12-15T06:28:02.8892449Z Chocolatey installed 0/1 packages. 1 packages failed.
2019-12-15T06:28:02.8892561Z  See the log for details (C:\ProgramData\chocolatey\logs\chocolatey.log).
2019-12-15T06:28:02.8896581Z 
2019-12-15T06:28:02.8904995Z Failures
2019-12-15T06:28:02.8911465Z  - msys2 (exited 1) - msys2 not installed. An error occurred during installation:
2019-12-15T06:28:02.8911619Z  The remote server returned an error: (503) Server Unavailable. Service Unavailable
2019-12-15T06:28:03.8367961Z 
2019-12-15T06:28:03.8442765Z ##[error]Bash exited with code '1'.
2019-12-15T06:28:03.8597610Z ##[section]Starting: Checkout
2019-12-15T06:28:03.8710126Z ==============================================================================
2019-12-15T06:28:03.8710231Z Task         : Get sources
2019-12-15T06:28:03.8710347Z Description  : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.

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
Copy link
Contributor

bors commented Dec 15, 2019

💔 Test failed - checks-azure

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

Centril commented Dec 15, 2019

@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 Dec 15, 2019
@bors
Copy link
Contributor

bors commented Dec 15, 2019

⌛ Testing commit e5c3441 with merge a605441...

bors added a commit that referenced this pull request Dec 15, 2019
@bors
Auto merge of #67310 - Centril:rollup-22jiyow, r=Centril
a605441 
Rollup of 6 pull requests

Successful merges:

 - #67255 (Remove i686-unknown-dragonfly target)
 - #67267 (Fix signature of `__wasilibc_find_relpath`)
 - #67282 (Fix example code of OpenOptions::open)
 - #67289 (Do not ICE on unnamed future)
 - #67300 (Restore original implementation of Vec::retain)
 - #67305 (Doc typo)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Dec 15, 2019

☀️ Test successful - checks-azure
Approved by: Centril
Pushing a605441 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 15, 2019
@bors bors merged commit e5c3441 into rust-lang:master Dec 15, 2019
@Centril Centril deleted the rollup-22jiyow branch December 15, 2019 10:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
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
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
9 participants
@Centril @bors @rust-highfive @tuxillo @alexcrichton @pjw91 @aloucks @estebank @kappa