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 11 pull requests #64442

Closed
wants to merge 27 commits into from
Closed

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 13, 2019

Successful merges:

Failed merges:

r? @ghost

bpangWR and others added 27 commits September 10, 2019 15:11
Sync with rust-lang/rust master branch
declare EnvKey before use to fix build error
Intrinsics can only be defined by the compiler.
Fast path for vec.clear/truncate

For trivial types like `u8`, `vec.truncate()`/`vec.clear()` relies on the optimizer to remove the loop. This means more work in debug builds, and more work for the optimizer.

Avoiding this busywork is exactly what `mem::needs_drop::<T>()` is for.
Trim rustc-workspace-hack

Those dependencies seem no longer necessary.
`./x.py test` and `x86_64-gnu-tools` container passed locally so I think this won't hurt.
…xcrichton

 declare EnvKey before use to fix build error

r? @alexcrichton
…nsic, r=Centril

Ban non-extern rust intrinsics

Intrinsics can only be defined by the compiler.

Fixes rust-lang#36979
…gify, r=Mark-Simulacrum

Remove raw string literal quotes from error index descriptions

The error index has unnecessary `r##"` and `"##` around the descriptions from rust-lang#63721. Removing the `stringify` call removes them.

r? @Mark-Simulacrum
…tural-match, r=varkor

fn ptr is structural match

Make fn ptr always structural match, regardless of whether the formal parameter types or return type are.

Fix rust-lang#63479.
codegen: use "_N" (like for other locals) instead of "argN", for argument names.

Based on rust-lang#64408 (second commit is new), fixing something I mentioned in rust-lang#64408 (which turned to be an immediate blocker for unifying relevant codepaths).

Closes rust-lang#64408 (by containing it).

r? @rkruppe
@Centril
Copy link
Contributor Author

Centril commented Sep 13, 2019

@bors r+ p=11 rollup=never

@bors
Copy link
Contributor

bors commented Sep 13, 2019

📌 Commit 589e238 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 Sep 13, 2019
@bors
Copy link
Contributor

bors commented Sep 13, 2019

⌛ Testing commit 589e238 with merge 0532d6041b1532619129379d232acc53c617f962...

@bors
Copy link
Contributor

bors commented Sep 14, 2019

💔 Test failed - checks-azure

@rust-highfive
Copy link
Collaborator

The job armhf-gnu 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.
2019-09-14T02:16:48.3334628Z failures:
2019-09-14T02:16:48.3338093Z 
2019-09-14T02:16:48.3342636Z ---- [incremental] incremental/hashes/function_interfaces.rs stdout ----
2019-09-14T02:16:48.3342911Z 
2019-09-14T02:16:48.3343328Z error in revision `cfail2`: test compilation failed although it shouldn't!
2019-09-14T02:16:48.3343554Z status: exit code: 1
2019-09-14T02:16:48.3345541Z command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/incremental/hashes/function_interfaces.rs" "-Zthreads=1" "--target=arm-unknown-linux-gnueabihf" "--cfg" "cfail2" "-C" "incremental=/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/hashes/function_interfaces/function_interfaces.inc" "-Z" "incremental-verify-ich" "-Z" "incremental-queries" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/hashes/function_interfaces" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/rust-test-helpers" "-Clinker=arm-linux-gnueabihf-gcc" "-Z" "query-dep-graph" "-Zincremental-ignore-spans" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental/hashes/function_interfaces/auxiliary"
2019-09-14T02:16:48.3347181Z ------------------------------------------
2019-09-14T02:16:48.3347409Z 
2019-09-14T02:16:48.3347807Z ------------------------------------------
2019-09-14T02:16:48.3347865Z stderr:
2019-09-14T02:16:48.3347865Z stderr:
2019-09-14T02:16:48.3348071Z ------------------------------------------
2019-09-14T02:16:48.3348137Z error[E0570]: The ABI `"stdcall"` is not supported for the current target
2019-09-14T02:16:48.3348494Z    |
2019-09-14T02:16:48.3348494Z    |
2019-09-14T02:16:48.3348547Z LL | pub extern "stdcall" fn make_stdcall() {}
2019-09-14T02:16:48.3348664Z 
2019-09-14T02:16:48.3348711Z error: aborting due to previous error
2019-09-14T02:16:48.3348760Z 
2019-09-14T02:16:48.3348984Z For more information about this error, try `rustc --explain E0570`.
---
2019-09-14T02:16:48.3366019Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:536:22
2019-09-14T02:16:48.3366178Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-09-14T02:16:48.3371201Z 
2019-09-14T02:16:48.3371282Z 
2019-09-14T02:16:48.3378455Z command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/arm-unknown-linux-gnueabihf/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/incremental" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/incremental" "--stage-id" "stage2-arm-unknown-linux-gnueabihf" "--mode" "incremental" "--target" "arm-unknown-linux-gnueabihf" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "arm-linux-gnueabihf-gcc" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/checkout/obj/build/arm-unknown-linux-gnueabihf/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--llvm-version" "9.0.0-rust-1.39.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--remote-test-client" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-09-14T02:16:48.3379054Z 
2019-09-14T02:16:48.3379086Z 
2019-09-14T02:16:48.3392350Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target arm-unknown-linux-gnueabihf
2019-09-14T02:16:48.3392453Z Build completed unsuccessfully in 2:25:21
2019-09-14T02:16:48.3392453Z Build completed unsuccessfully in 2:25:21
2019-09-14T02:16:48.3475519Z == clock drift check ==
2019-09-14T02:16:48.3490759Z   local time: Sat Sep 14 02:16:48 UTC 2019
2019-09-14T02:16:48.4468159Z   network time: Sat, 14 Sep 2019 02:16:48 GMT
2019-09-14T02:16:48.4470912Z == end clock drift check ==
2019-09-14T02:16:50.8018859Z ##[error]Bash exited with code '1'.
2019-09-14T02:16:50.8053326Z ##[section]Starting: Upload CPU usage statistics
2019-09-14T02:16:50.8061847Z ==============================================================================
2019-09-14T02:16:50.8061945Z Task         : Bash
2019-09-14T02:16:50.8062005Z Description  : Run a Bash script on macOS, Linux, or Windows

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 Sep 14, 2019
@Centril Centril closed this Sep 14, 2019
@Centril Centril deleted the rollup-0jxf91w branch September 14, 2019 10:19
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
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.