Rollup of 6 pull requests #65917

Centril · 2019-10-29T01:59:12Z

Successful merges:

Lint ignored #[inline] on function prototypes #65294 (Lint ignored #[inline] on function prototypes)
Call out the types that are non local on E0117 #65318 (Call out the types that are non local on E0117)
Update backtrace to 0.3.40 #65531 (Update backtrace to 0.3.40)
Improve the "try using a variant of the expected type" hint. #65562 (Improve the "try using a variant of the expected type" hint.)
Add new EFIAPI ABI #65809 (Add new EFIAPI ABI)
Better pretty printing for const raw pointers #65859 (Better pretty printing for const raw pointers)

Failed merges:

Adds a new ABI for the EFIAPI calls. This ABI should reflect the latest version of the UEFI specification at the time of commit (UEFI spec 2.8, URL below). The specification says that for x86_64, we should follow the win64 ABI, while on all other supported platforms (ia32, itanium, arm, arm64 and risc-v), we should follow the C ABI. To simplify the implementation, we will simply follow the C ABI on all platforms except x86_64, even those technically unsupported by the UEFI specification. https://uefi.org/sites/default/files/resources/UEFI_Spec_2_8_final.pdf

Use revisions to run the EFIABI in multiple configurations, compiling for each supported UEFI platform, and checking the ABI generated in the LLVM IR is correct. Use no_core to make it easier to test.

… pretty-printing mechanism.

…thewjasper Lint ignored `#[inline]` on function prototypes Fixes rust-lang#51280. - Adds a `unused_attribute` lint for `#[inline]` on function prototypes. - As a consequence, foreign items, impl items and trait items now have their attributes checked, which could cause some code to no longer compile (it was previously erroneously ignored).

Call out the types that are non local on E0117 CC rust-lang#24745.

@cramertj

Update backtrace to 0.3.40 Diff: rust-lang/backtrace-rs@0.3.37...b5cc5b1 Pretty low risk, considering the only changes are in low-tier targets. r? @cramertj cc @alexcrichton

Improve the "try using a variant of the expected type" hint. Fix rust-lang#65494. - Change type-printing output. - Use `span_to_snippet` when possible. - Change the message to `try using a variant of the expected enum`

Add new EFIAPI ABI Fixes rust-lang#54527 Adds a new ABI, "efiapi", which reflects the calling convention as specified by [the current spec UEFI spec](https://uefi.org/sites/default/files/resources/UEFI%20Spec%202_7_A%20Sept%206.pdf#G6.999903). When compiling for x86_64, we should select the `win64` ABI, while on all other architectures (Itanium, x86, ARM and ARM64 and RISC-V), we should select the `C` ABI. Currently, this is done by just turning it into the C ABI everywhere except on x86_64, where it's turned into the win64 ABI. Should we prevent this ABI from being used on unsupported architectures, and if so, how would this be done?

…mertj Better pretty printing for const raw pointers closes rust-lang#65349, hopefully.

Centril · 2019-10-29T01:59:26Z

@bors r+ p=6 rollup=never

bors · 2019-10-29T01:59:27Z

📌 Commit d847482 has been approved by Centril

bors · 2019-10-29T01:59:55Z

⌛ Testing commit d847482 with merge f39d604f09fb0c56dfdae05973491f04615bffa4...

bors · 2019-10-29T03:05:17Z

💔 Test failed - checks-azure

rust-highfive · 2019-10-29T03:05:18Z

The job i686-apple 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-10-29T02:56:34.8428680Z test [ui] ui/lint/unused_parens_json_suggestion.rs ... ok
2019-10-29T02:56:34.9600530Z test [ui] ui/lint/use_suggestion_json.rs ... ok
2019-10-29T02:56:35.0109080Z test [ui] ui/lint/unused_parens_remove_json_suggestion.rs ... ok
2019-10-29T02:56:35.0362110Z test [ui] ui/lint/use-redundant.rs ... ok
2019-10-29T02:56:35.0617600Z test [ui] ui/lint/warn-unused-inline-on-fn-prototypes.rs ... ok
2019-10-29T02:56:35.2948500Z test [ui] ui/list.rs ... ok
2019-10-29T02:56:35.3048480Z test [ui] ui/liveness-assign-imm-local-after-ret.rs ... ok
2019-10-29T02:56:35.3150150Z test [ui] ui/liveness/liveness-assign/liveness-assign-imm-local-in-op-eq.rs ... ok
2019-10-29T02:56:35.4303850Z test [ui] ui/liveness/liveness-closure-require-ret.rs ... ok
---
2019-10-29T03:02:14.6186950Z diff of stderr:
2019-10-29T03:02:14.6187000Z 
2019-10-29T03:02:14.6187650Z 10   --> $DIR/raw-ptr-const-param.rs:7:38
2019-10-29T03:02:14.6188090Z 11    |
2019-10-29T03:02:14.6188200Z 12 LL |     let _: Const<{15 as *const _}> = Const::<{10 as *const _}>;
2019-10-29T03:02:14.6189250Z -    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `0x000000000000000f : *const u32`, found `0x000000000000000a : *const u32`
2019-10-29T03:02:14.6189510Z +    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `0x0000000f : *const u32`, found `0x0000000a : *const u32`
2019-10-29T03:02:14.6189650Z 14    |
2019-10-29T03:02:14.6190350Z -    = note: expected type `Const<0x000000000000000f : *const u32>`
2019-10-29T03:02:14.6191060Z -               found type `Const<0x000000000000000a : *const u32>`
2019-10-29T03:02:14.6191190Z +    = note: expected type `Const<0x0000000f : *const u32>`
2019-10-29T03:02:14.6191310Z +               found type `Const<0x0000000a : *const u32>`
2019-10-29T03:02:14.6191490Z 18 error: aborting due to previous error
2019-10-29T03:02:14.6191580Z 19 
2019-10-29T03:02:14.6191640Z 
2019-10-29T03:02:14.6191680Z 
2019-10-29T03:02:14.6191680Z 
2019-10-29T03:02:14.6191780Z The actual stderr differed from the expected stderr.
2019-10-29T03:02:14.6192590Z Actual stderr saved to /Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/test/ui/const-generics/raw-ptr-const-param/raw-ptr-const-param.stderr
2019-10-29T03:02:14.6193340Z To update references, rerun the tests and pass the `--bless` flag
2019-10-29T03:02:14.6194060Z To only update this specific test, also pass `--test-args const-generics/raw-ptr-const-param.rs`
2019-10-29T03:02:14.6194240Z error: 1 errors occurred comparing output.
2019-10-29T03:02:14.6194340Z status: exit code: 1
2019-10-29T03:02:14.6194340Z status: exit code: 1
2019-10-29T03:02:14.6195880Z command: "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "/Users/runner/runners/2.159.2/work/1/s/src/test/ui/const-generics/raw-ptr-const-param.rs" "-Zthreads=1" "--target=i686-apple-darwin" "--error-format" "json" "-Zui-testing" "-C" "prefer-dynamic" "--out-dir" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/test/ui/const-generics/raw-ptr-const-param" "-Crpath" "-O" "-Cdebuginfo=0" "-Zunstable-options" "-Lnative=/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "-L" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/test/ui/const-generics/raw-ptr-const-param/auxiliary" "-A" "unused"
2019-10-29T03:02:14.6196900Z ------------------------------------------
2019-10-29T03:02:14.6196990Z 
2019-10-29T03:02:14.6197610Z ------------------------------------------
2019-10-29T03:02:14.6197740Z stderr:
---
2019-10-29T03:02:14.6199810Z 
2019-10-29T03:02:14.6199890Z error[E0308]: mismatched types
2019-10-29T03:02:14.6200630Z   --> /Users/runner/runners/2.159.2/work/1/s/src/test/ui/const-generics/raw-ptr-const-param.rs:7:38
2019-10-29T03:02:14.6200760Z    |
2019-10-29T03:02:14.6200860Z LL |     let _: Const<{15 as *const _}> = Const::<{10 as *const _}>; //~ mismatched types
2019-10-29T03:02:14.6201010Z    |                                      ^^^^^^^^^^^^^^^^^^^^^^^^^ expected `0x0000000f : *const u32`, found `0x0000000a : *const u32`
2019-10-29T03:02:14.6201130Z    |
2019-10-29T03:02:14.6201230Z    = note: expected type `Const<0x0000000f : *const u32>`
2019-10-29T03:02:14.6201330Z               found type `Const<0x0000000a : *const u32>`
2019-10-29T03:02:14.6201860Z error: aborting due to previous error
2019-10-29T03:02:14.6201940Z 
2019-10-29T03:02:14.6202640Z For more information about this error, try `rustc --explain E0308`.
2019-10-29T03:02:14.6202730Z 
---
2019-10-29T03:02:14.6289920Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22
2019-10-29T03:02:14.6290320Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
2019-10-29T03:02:14.6307660Z 
2019-10-29T03:02:14.6307850Z 
2019-10-29T03:02:14.6320540Z command did not execute successfully: "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/stage0-tools-bin/compiletest" "--compile-lib-path" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/stage2/lib" "--run-lib-path" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/stage2/lib/rustlib/i686-apple-darwin/lib" "--rustc-path" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/stage2/bin/rustc" "--src-base" "/Users/runner/runners/2.159.2/work/1/s/src/test/ui" "--build-base" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/test/ui" "--stage-id" "stage2-i686-apple-darwin" "--mode" "ui" "--target" "i686-apple-darwin" "--host" "i686-apple-darwin" "--llvm-filecheck" "/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/llvm/build/bin/FileCheck" "--nodejs" "/usr/local/bin/node" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0 -Zunstable-options  -Lnative=/Users/runner/runners/2.159.2/work/1/s/build/i686-apple-darwin/native/rust-test-helpers" "--docck-python" "/usr/local/bin/python2.7" "--lldb-python" "/usr/bin/python" "--lldb-version" "lldb-902.0.79.2\n  Swift-4.1\n" "--lldb-python-dir" "/Applications/Xcode_9.3.app/Contents/SharedFrameworks/LLDB.framework/Resources/Python" "--llvm-version" "9.0.0-rust-1.40.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
2019-10-29T03:02:14.6321580Z 
2019-10-29T03:02:14.6321640Z 
2019-10-29T03:02:14.6325970Z failed to run: /Users/runner/runners/2.159.2/work/1/s/build/bootstrap/debug/bootstrap test
2019-10-29T03:02:14.6326170Z Build completed unsuccessfully in 0:56:40
2019-10-29T03:02:14.6326170Z Build completed unsuccessfully in 0:56:40
2019-10-29T03:02:14.6448180Z == clock drift check ==
2019-10-29T03:02:14.6498790Z   local time: Tue Oct 29 03:02:14 UTC 2019
2019-10-29T03:02:14.7364700Z   network time: Tue, 29 Oct 2019 03:02:14 GMT
2019-10-29T03:02:14.7367750Z == end clock drift check ==
2019-10-29T03:02:14.7435320Z 
2019-10-29T03:02:14.7579630Z ##[error]Bash exited with code '1'.
2019-10-29T03:02:14.7631660Z ##[section]Starting: Upload CPU usage statistics
2019-10-29T03:02:14.7636370Z ==============================================================================
2019-10-29T03:02:14.7636490Z Task         : Bash
2019-10-29T03:02:14.7636580Z 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)

roblabla and others added 30 commits October 25, 2019 13:01

Fix EFIABI test

6173280

Use revisions to run the EFIABI in multiple configurations, compiling for each supported UEFI platform, and checking the ABI generated in the LLVM IR is correct. Use no_core to make it easier to test.

Fix inverted check in EFIAPI

13d27af

Add proper tracking issue for EFIAPI

e54ae51

EFIAPI: Fix symbolname tests

174d4f9

Refactor check_attr

7f3c843

Emit warning for ignored #[inline] on trait method prototypes

94c4dd9

Emit warning for ignored #[inline] on foreign function prototypes

66d7ef0

Improve comments

af2b497

Add test for attribute error checking on trait and foreign items

4552c8f

Refactor check_track_caller

41ee9ea

Handle ImplItem in check_attr

8042206

Update bitflags

b925eb5

Move handling of #[track_caller] to check_attr

e8566fb

Permit #[target_feature] on method implementations

6446f19

Permit #[track_caller] on inherent methods

f8db8ff

Make inline associated constants a future compatibility warning

f47f530

Only run efiapi test on llvm 9.0+

1099826

Better pretty printing for const raw pointers

22586d7

Add the two missing hex digits

6a6ed12

Call out the types that are non local on E0117

adfe9a4

Use more targeted spans for orphan rule errors

9b4f811

Further tweak spans for better readability

56aa89c

Talk about specific types and remove lifetimes from output

daeafd8

Account for tuples in explanation

db1bfbd

Do not display ADT type arguments and fix rebase

95364df

add comment

2cd28c1

Fix rebase

627691f

Improve the "try using a variant of the expected type" hint.

273ee61

Fix a previously forgotten pretty-printing test after a change to the…

e188e2d

… pretty-printing mechanism.

Patryk27 and others added 8 commits October 28, 2019 18:44

Improve pretty-printing for compound qualified paths.

5c023d6

Update backtrace to 0.3.40

d7f99da

Rollup merge of rust-lang#65318 - estebank:coherence, r=varkor

515dce5

Call out the types that are non local on E0117 CC rust-lang#24745.

Rollup merge of rust-lang#65531 - tmandry:bump-backtrace, r=cramertj

f865095

Update backtrace to 0.3.40 Diff: rust-lang/backtrace-rs@0.3.37...b5cc5b1 Pretty low risk, considering the only changes are in low-tier targets. r? @cramertj cc @alexcrichton

Rollup merge of rust-lang#65562 - Patryk27:master, r=estebank

b18d0ca

Improve the "try using a variant of the expected type" hint. Fix rust-lang#65494. - Change type-printing output. - Use `span_to_snippet` when possible. - Change the message to `try using a variant of the expected enum`

Rollup merge of rust-lang#65859 - iwikal:pretty-const-pointers, r=cra…

d847482

…mertj Better pretty printing for const raw pointers closes rust-lang#65349, hopefully.

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 29, 2019

Centril added the rollup A PR which is a rollup label Oct 29, 2019

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 Oct 29, 2019

Centril closed this Oct 29, 2019

Centril deleted the rollup-08uzkfy branch October 29, 2019 03:07

Centril mentioned this pull request Oct 29, 2019

Better pretty printing for const raw pointers #65859

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 6 pull requests #65917

Rollup of 6 pull requests #65917

Centril commented Oct 29, 2019

Centril commented Oct 29, 2019

bors commented Oct 29, 2019

bors commented Oct 29, 2019

bors commented Oct 29, 2019

rust-highfive commented Oct 29, 2019

Rollup of 6 pull requests #65917

Rollup of 6 pull requests #65917

Conversation

Centril commented Oct 29, 2019

Centril commented Oct 29, 2019

bors commented Oct 29, 2019

bors commented Oct 29, 2019

bors commented Oct 29, 2019

rust-highfive commented Oct 29, 2019