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 9 pull requests #69931

Closed
wants to merge 37 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Mar 11, 2020

Successful merges:

Failed merges:

r? @ghost

simlay and others added 30 commits January 10, 2020 18:48
…d a long lost assertion

This reverts part of commit 9712fa4.
Co-Authored-By: Ralf Jung <post@ralfj.de>
This bumps the commit of webrender we test to include a fix for a
spurious failure we encountered in CI. See rust-lang#69895 for more context on
the spurious failure.
Added tvOS as targets

This is a first attempt of adding support tvOS as described in rust-lang#48862. It's got a lot of overlap with [src/librustc_target/spec/apple_ios_base.rs](https://github.com/rust-lang/rust/blob/31dd4f4acbcbdb02b0745d2136399ed664a28050/src/librustc_target/spec/apple_ios_base.rs).

I thought about refactoring `apple_ios_base.rs` to include this as well but that would require each of the ios and tvos targets to be of the something like the form `let base = opts(AppleOS::TV, Arch::Arm64)?;` I also did the same thing for watchOS because from what I can tell, all three targets (iOS, tvOS, and watchOS) have the same logic but have different parameters being sent to `xcrun`. Thoughts?

As far as the `data_layout` and other parameters to `Target`, I did as much research as I could but it really seems that processor in the [iPhone 11 is the same as the apple TV](https://en.wikipedia.org/wiki/Apple-designed_processors) so I didn't change any of those parameters.

I did get this to build and tested that it's actually running the the below logic (because the parameter to `xcrun` is `appletvos` not `tvos`).

I didn't manage to get it to actually compile a file with `fn main(){}` because I don't have the stdlib for `aarch64-apple-tvos` compiled it seems. Is there documentation for this?

Similar to the ending of rust-lang#63467, I'm not sure what to do next.
…rk-Simulacrum

Document unsafe blocks in core::fmt

r? @RalfJung
CC: @rust-lang/wg-unsafe-code-guidelines
rust-lang#66219

Sorry for the hiatus, but here's a few more files with the unsafe blocks documented! I think working on it smaller chunks like this will be easier for everyone.
…lfJung

Compute the correct layout for variants of uninhabited enums

r? @eddyb
cc @RalfJung

fixes rust-lang#69191
cc rust-lang#69763
…=oli-obk

miri: ICE on invalid terminators

We've run a lot of MIR in Miri (including some generators) and never seen these.

@tmandry is it correct that `Yield` and `GeneratorDrop` get lowered away?

@eddyb @oli-obk what's with this `Abort` that does not seem to ever actually exist? Codegen *does* seem to handle it, so I wonder why Miri can get away without that. In fact, codegen handles it twice:

https://github.com/rust-lang/rust/blob/1d5241c96208ca7d925442b1a5fa45ad18717a6f/src/librustc_codegen_ssa/mir/block.rs#L796

https://github.com/rust-lang/rust/blob/1d5241c96208ca7d925442b1a5fa45ad18717a6f/src/librustc_codegen_ssa/mir/mod.rs#L296
rustdoc: remove unused import

```
    Checking rustdoc v0.0.0 (/home/matthias/vcs/github/rust/src/librustdoc)
warning: unused import: `rustc_span::symbol::sym`
  --> src/librustdoc/clean/inline.rs:15:5
   |
15 | use rustc_span::symbol::sym;
   |     ^^^^^^^^^^^^^^^^^^^^^^^
   |
   = note: `#[warn(unused_imports)]` on by default
```
…er, r=Mark-Simulacrum

ci: bump webrender in cargotest

This bumps the commit of webrender we test to include a fix for a spurious failure we encountered in CI. See rust-lang#69895 for more context on the spurious failure.

The commit we're interested in including is servo/webrender@07439c5. Thanks again @jrmuizel for the quick response on this!

r? @Mark-Simulacrum
@Centril Centril added the rollup A PR which is a rollup label Mar 11, 2020
@Centril
Copy link
Contributor Author

Centril commented Mar 11, 2020

@bors r+ p=9 rollup=never

@bors
Copy link
Contributor

bors commented Mar 11, 2020

📌 Commit 3002bd2 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 Mar 11, 2020
@bors
Copy link
Contributor

bors commented Mar 11, 2020

⌛ Testing commit 3002bd2 with merge b14c2937c5a714037c60990d54e371c5c0819565...

@rust-highfive
Copy link
Collaborator

The job x86_64-msvc-cargo of 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.
2020-03-11T22:37:34.2789689Z Initialized empty Git repository in C:/MORE_SPACE/ct/webrender/.git/
2020-03-11T22:37:34.3055834Z fatal: Could not parse object '6f23331299bf47e7e4683b815d10320770e14e21'.
2020-03-11T22:37:37.9108175Z From https://github.com/servo/webrender
2020-03-11T22:37:37.9108541Z  * branch            master     -> FETCH_HEAD
2020-03-11T22:37:38.6676379Z HEAD is now at 6f23331 Auto merge of #3881 - moz-gfx:github-sync, r=auto
2020-03-11T22:37:38.7460786Z     Updating git repository `https://github.com/rust-windowing/android-rs-glue.git`
---
2020-03-11T22:38:24.8391902Z    Compiling procedural-masquerade v0.1.6
2020-03-11T22:38:25.0441265Z    Compiling dtoa v0.4.2
2020-03-11T22:38:25.2734302Z    Compiling itoa v0.4.1
2020-03-11T22:38:25.4982941Z    Compiling percent-encoding v2.1.0
2020-03-11T22:38:25.9847610Z    Compiling bytemuck v1.2.0
2020-03-11T22:38:26.2551846Z    Compiling binary-space-partition v0.1.2
2020-03-11T22:38:26.3652470Z    Compiling httparse v1.2.4
2020-03-11T22:38:26.8188453Z    Compiling svg_fmt v0.4.0
2020-03-11T22:38:27.3279425Z    Compiling semver-parser v0.7.0
---
2020-03-11T22:40:41.5599724Z    Compiling ws v0.9.0
2020-03-11T22:40:47.7996438Z error: failed to run custom build command for `compositor-windows v0.1.0 (D:\a\1\s\build\ct\webrender\example-compositor\compositor-windows)`
2020-03-11T22:40:47.7997526Z 
2020-03-11T22:40:47.7997853Z Caused by:
2020-03-11T22:40:47.7998491Z   process didn't exit successfully: `D:\a\1\s\build\ct\webrender\target\debug\build\compositor-windows-a42f9fe4a6ab9aa2\build-script-build` (exit code: 101)
2020-03-11T22:40:47.7999145Z --- stdout
2020-03-11T22:40:47.7999502Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.7999847Z OPT_LEVEL = Some("0")
2020-03-11T22:40:47.8000230Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8000607Z HOST = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8001023Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8001472Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8001845Z HOST = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8002234Z CC_x86_64-pc-windows-msvc = None
2020-03-11T22:40:47.8002580Z CC_x86_64_pc_windows_msvc = None
2020-03-11T22:40:47.8002996Z HOST_CC = None
2020-03-11T22:40:47.8003256Z CC = None
2020-03-11T22:40:47.8003510Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8003847Z HOST = Some("x86_64-pc-windows-msvc")
2020-03-11T22:40:47.8004478Z CFLAGS_x86_64-pc-windows-msvc = None
2020-03-11T22:40:47.8004863Z CFLAGS_x86_64_pc_windows_msvc = None
2020-03-11T22:40:47.8005128Z HOST_CFLAGS = None
2020-03-11T22:40:47.8005401Z CFLAGS = None
2020-03-11T22:40:47.8005670Z DEBUG = Some("true")
2020-03-11T22:40:47.8006518Z running: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "/nologo" "/MD" "/Z7" "/I" "../../../angle/checkout/include" "/W4" "/FoD:\\a\\1\\s\\build\\ct\\webrender\\target\\debug\\build\\compositor-windows-4a6bb37668b71e84\\out\\src/lib.o" "/c" "src/lib.cpp"
2020-03-11T22:40:47.8007284Z lib.cpp
2020-03-11T22:40:47.8007702Z src/lib.cpp(20): fatal error C1083: Cannot open include file: 'EGL/egl.h': No such file or directory
2020-03-11T22:40:47.8008321Z 
2020-03-11T22:40:47.8008521Z --- stderr
2020-03-11T22:40:47.8008805Z thread 'main' panicked at '
2020-03-11T22:40:47.8009012Z 
2020-03-11T22:40:47.8009012Z 
2020-03-11T22:40:47.8009940Z Internal error occurred: Command "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "/nologo" "/MD" "/Z7" "/I" "../../../angle/checkout/include" "/W4" "/FoD:\\a\\1\\s\\build\\ct\\webrender\\target\\debug\\build\\compositor-windows-4a6bb37668b71e84\\out\\src/lib.o" "/c" "src/lib.cpp" with args "cl.exe" did not execute successfully (status code exit code: 2).
2020-03-11T22:40:47.8011238Z ', C:\Users\VssAdministrator\.cargo\registry\src\github.51.al-1ecc6299db9ec823\cc-1.0.15\src\lib.rs:2158:5
2020-03-11T22:40:47.8011804Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-03-11T22:40:47.8012085Z 
2020-03-11T22:40:47.8012498Z warning: build failed, waiting for other jobs to finish...
---
2020-03-11T22:51:15.0667182Z   local time: Wed Mar 11 22:51:14 CUT 2020
2020-03-11T22:51:15.2274541Z   network time: Wed, 11 Mar 2020 22:51:15 GMT
2020-03-11T22:51:15.2307681Z == end clock drift check ==
2020-03-11T22:51:15.3434840Z 
2020-03-11T22:51:15.6847448Z ##[error]Bash exited with code '1'.
2020-03-11T22:51:15.7954194Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-11T22:51:15.8917300Z ==============================================================================
2020-03-11T22:51:15.8917753Z Task         : Get sources
2020-03-11T22:51:15.8918129Z 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 @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Mar 11, 2020

💔 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 Mar 11, 2020
@bors
Copy link
Contributor

bors commented Mar 12, 2020

⌛ Testing commit 3002bd2 with merge ae76f51b1d48d5c6dfbcf450771afe772530dc1b...

@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.

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 @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Mar 12, 2020

💔 Test failed - checks-azure

@RalfJung
Copy link
Member

2020-03-12T09:14:12.6118214Z curl: (56) OpenSSL SSL_read: Connection was reset, errno 10054

@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 Mar 12, 2020
@bors
Copy link
Contributor

bors commented Mar 12, 2020

⌛ Testing commit 3002bd2 with merge 68153d19de0b738f090a3dba34530a3804625c44...

@rust-highfive
Copy link
Collaborator

The job x86_64-msvc-cargo of 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.
2020-03-12T14:02:58.5116988Z Initialized empty Git repository in C:/MORE_SPACE/ct/webrender/.git/
2020-03-12T14:02:58.5374460Z fatal: Could not parse object '6f23331299bf47e7e4683b815d10320770e14e21'.
2020-03-12T14:03:00.0720501Z From https://github.com/servo/webrender
2020-03-12T14:03:00.0721421Z  * branch            master     -> FETCH_HEAD
2020-03-12T14:03:00.6951113Z HEAD is now at 6f23331 Auto merge of #3881 - moz-gfx:github-sync, r=auto
2020-03-12T14:03:00.7892035Z     Updating git repository `https://github.com/rust-windowing/android-rs-glue.git`
---
2020-03-12T14:03:51.3530715Z    Compiling procedural-masquerade v0.1.6
2020-03-12T14:03:51.3531035Z    Compiling percent-encoding v2.1.0
2020-03-12T14:03:51.3531318Z    Compiling dtoa v0.4.2
2020-03-12T14:03:51.3531528Z    Compiling itoa v0.4.1
2020-03-12T14:03:51.3531836Z    Compiling bytemuck v1.2.0
2020-03-12T14:03:51.3532347Z    Compiling binary-space-partition v0.1.2
2020-03-12T14:03:51.3532640Z    Compiling lazy_static v0.2.11
2020-03-12T14:03:51.3532866Z    Compiling svg_fmt v0.4.0
2020-03-12T14:03:51.3533395Z    Compiling semver-parser v0.7.0
---
2020-03-12T14:06:37.0034476Z    Compiling ws v0.9.0
2020-03-12T14:06:41.4892254Z error: failed to run custom build command for `compositor-windows v0.1.0 (D:\a\1\s\build\ct\webrender\example-compositor\compositor-windows)`
2020-03-12T14:06:41.4893223Z 
2020-03-12T14:06:41.4935663Z Caused by:
2020-03-12T14:06:41.4936579Z   process didn't exit successfully: `D:\a\1\s\build\ct\webrender\target\debug\build\compositor-windows-734cecd79004d476\build-script-build` (exit code: 101)
2020-03-12T14:06:41.4937301Z --- stdout
2020-03-12T14:06:41.4937630Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5170057Z OPT_LEVEL = Some("0")
2020-03-12T14:06:41.5481007Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5481592Z HOST = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5482364Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5482752Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5483200Z HOST = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5483943Z CC_x86_64-pc-windows-msvc = None
2020-03-12T14:06:41.5484499Z CC_x86_64_pc_windows_msvc = None
2020-03-12T14:06:41.5484857Z HOST_CC = None
2020-03-12T14:06:41.5485119Z CC = None
2020-03-12T14:06:41.5485483Z TARGET = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5485888Z HOST = Some("x86_64-pc-windows-msvc")
2020-03-12T14:06:41.5486248Z CFLAGS_x86_64-pc-windows-msvc = None
2020-03-12T14:06:41.5486652Z CFLAGS_x86_64_pc_windows_msvc = None
2020-03-12T14:06:41.5486973Z HOST_CFLAGS = None
2020-03-12T14:06:41.5487303Z CFLAGS = None
2020-03-12T14:06:41.5487637Z DEBUG = Some("true")
2020-03-12T14:06:41.5488681Z running: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "/nologo" "/MD" "/Z7" "/I" "../../../angle/checkout/include" "/W4" "/FoD:\\a\\1\\s\\build\\ct\\webrender\\target\\debug\\build\\compositor-windows-44acd910b2bf945c\\out\\src/lib.o" "/c" "src/lib.cpp"
2020-03-12T14:06:41.5489664Z lib.cpp
2020-03-12T14:06:41.5490165Z src/lib.cpp(20): fatal error C1083: Cannot open include file: 'EGL/egl.h': No such file or directory
2020-03-12T14:06:41.5490914Z 
2020-03-12T14:06:41.5491152Z --- stderr
2020-03-12T14:06:41.5491488Z thread 'main' panicked at '
2020-03-12T14:06:41.5491732Z 
2020-03-12T14:06:41.5491732Z 
2020-03-12T14:06:41.5492896Z Internal error occurred: Command "C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\VC\\Tools\\MSVC\\14.16.27023\\bin\\HostX64\\x64\\cl.exe" "/nologo" "/MD" "/Z7" "/I" "../../../angle/checkout/include" "/W4" "/FoD:\\a\\1\\s\\build\\ct\\webrender\\target\\debug\\build\\compositor-windows-44acd910b2bf945c\\out\\src/lib.o" "/c" "src/lib.cpp" with args "cl.exe" did not execute successfully (status code exit code: 2).
2020-03-12T14:06:41.5494492Z ', C:\Users\VssAdministrator\.cargo\registry\src\github.51.al-1ecc6299db9ec823\cc-1.0.15\src\lib.rs:2158:5
2020-03-12T14:06:41.5495163Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace
2020-03-12T14:06:41.5495502Z 
2020-03-12T14:06:41.5495893Z warning: build failed, waiting for other jobs to finish...
---
2020-03-12T14:19:58.8455391Z   local time: Thu Mar 12 14:19:58 CUT 2020
2020-03-12T14:19:59.2723644Z   network time: Thu, 12 Mar 2020 14:19:59 GMT
2020-03-12T14:19:59.2771705Z == end clock drift check ==
2020-03-12T14:19:59.3681874Z 
2020-03-12T14:19:59.6529919Z ##[error]Bash exited with code '1'.
2020-03-12T14:19:59.7090856Z ##[section]Starting: Checkout rust-lang/rust@auto to s
2020-03-12T14:19:59.9020081Z ==============================================================================
2020-03-12T14:19:59.9020462Z Task         : Get sources
2020-03-12T14:19:59.9024683Z 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 @rust-lang/infra. (Feature Requests)

@bors
Copy link
Contributor

bors commented Mar 12, 2020

💔 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 Mar 12, 2020
@Centril Centril closed this Mar 12, 2020
@Centril Centril deleted the rollup-hma2bym branch March 12, 2020 15:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.
Projects
None yet
Development

Successfully merging this pull request may close these issues.