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 6 pull requests #64390

Closed
wants to merge 17 commits into from

Conversation

@Centril
Copy link
Member

commented Sep 11, 2019

Successful merges:

  • #64359 (Forbid opaque types in extern "C" blocks)
  • #64360 (Correct the polymorphic extern fn error for const parameters)
  • #64372 (use randSecure and randABytes)
  • #64378 (Fix inconsistent link formatting.)
  • #64381 (Upgrade parking_lot and tempfile rustc dependencies)
  • #64384 (Trim rustc-workspace-hack)

Failed merges:

r? @ghost

varkor and others added 17 commits Sep 10, 2019
use randSecure and randABytes
Forbid opaque types in `extern "C"` blocks

Fixes #64338.
…cs, r=cramertj

Correct the polymorphic extern fn error for const parameters

Before, any polymorphism on extern functions was assumed to be type polymorphism.
use randSecure and randABytes

r? @alexcrichton

cc @n-salim
Fix inconsistent link formatting.
Upgrade parking_lot and tempfile rustc dependencies

This should be last piece to unbreak `rustc` in #63848
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.
@Centril

This comment has been minimized.

Copy link
Member Author

commented Sep 11, 2019

@bors r+ p=6 rollup=never

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 11, 2019

📌 Commit c4f25bf has been approved by Centril

@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

⌛️ Testing commit c4f25bf with merge 27d5b11...

bors added a commit that referenced this pull request Sep 12, 2019
Rollup of 6 pull requests

Successful merges:

 - #64359 (Forbid opaque types in `extern "C"` blocks)
 - #64360 (Correct the polymorphic extern fn error for const parameters)
 - #64372 (use randSecure and randABytes)
 - #64378 (Fix inconsistent link formatting.)
 - #64381 (Upgrade parking_lot and tempfile rustc dependencies)
 - #64384 (Trim rustc-workspace-hack)

Failed merges:

r? @ghost
@bors

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

💔 Test failed - checks-azure

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

commented Sep 12, 2019

The job dist-x86_64-apple-alt of your PR failed (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-12T04:13:28.3924340Z [RUSTC-TIMING] rustfmt test:false 13.734
2019-09-12T04:13:29.6811370Z [RUSTC-TIMING] cargo_fmt test:false 15.020
2019-09-12T04:13:30.3339430Z [RUSTC-TIMING] git_rustfmt test:false 15.675
2019-09-12T04:13:30.3530620Z     Finished release [optimized] target(s) in 6m 02s
2019-09-12T04:13:30.3915900Z duplicate artifacts found when compiling a tool, this typically means that something was recompiled because a transitive dependency has different features activated than in a previous build:
2019-09-12T04:13:30.3916420Z 
2019-09-12T04:13:30.3916910Z the following dependencies are duplicated although they have the same features enabled:
2019-09-12T04:13:30.3917280Z the following dependencies have different features:
2019-09-12T04:13:30.3918220Z   smallvec 0.6.10 (registry+https://github.com/rust-lang/crates.io-index)
2019-09-12T04:13:30.3919150Z     `rustfmt` additionally enabled features {"union", "may_dangle"} at "/Users/vsts/agent/2.155.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libsmallvec-c40ca41794accb8b.rlib"
2019-09-12T04:13:30.3920090Z     `cargo` additionally enabled features {} at "/Users/vsts/agent/2.155.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libsmallvec-481a098d400b358b.rlib"
2019-09-12T04:13:30.3920220Z 
2019-09-12T04:13:30.3921250Z to fix this you will probably want to edit the local src/tools/rustc-workspace-hack/Cargo.toml crate, as that will update the dependency graph to ensure that these crates all share the same feature set
2019-09-12T04:13:30.3922090Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:198:13
2019-09-12T04:13:30.4018700Z failed to run: /Users/vsts/agent/2.155.1/work/1/s/build/bootstrap/debug/bootstrap dist
2019-09-12T04:13:30.4019010Z Build completed unsuccessfully in 1:17:08
2019-09-12T04:13:30.4095180Z == clock drift check ==
2019-09-12T04:13:30.4148660Z   local time: Thu Sep 12 04:13:30 UTC 2019
2019-09-12T04:13:30.4148660Z   local time: Thu Sep 12 04:13:30 UTC 2019
2019-09-12T04:13:30.5168490Z   network time: Thu, 12 Sep 2019 04:13:30 GMT
2019-09-12T04:13:30.5171320Z == end clock drift check ==
2019-09-12T04:13:30.5377270Z ##[error]Bash exited with code '1'.
2019-09-12T04:13:30.5438650Z ##[section]Starting: Upload CPU usage statistics
2019-09-12T04:13:30.5443720Z ==============================================================================
2019-09-12T04:13:30.5443850Z Task         : Bash
2019-09-12T04:13:30.5443930Z 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)

@mati865

This comment has been minimized.

Copy link
Contributor

commented Sep 12, 2019

Caused by #64384
Apparently this check is ran neither by x.py test or x86_64-gnu-tools.

@Centril Centril closed this Sep 12, 2019
@Centril Centril deleted the Centril:rollup-oexzlei branch Sep 12, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
8 participants
You can’t perform that action at this time.