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 5 pull requests #68181

Closed
wants to merge 12 commits into from

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

ollie27 and others added 12 commits January 7, 2020 23:21
This is primarily updating the `curl` dependency, but also went ahead
and applied a few updates for other packages that Cargo depends on.
…meGomez

rustdoc: Don't allow `#![feature(...)]` on stable or beta

Fixes rust-lang#67647

r? @GuillaumeGomez
…rk-Simulacrum

Update some of Cargo's dependencies

This is primarily updating the `curl` dependency, but also went ahead
and applied a few updates for other packages that Cargo depends on.
libterm: parse extended terminfo format

Fixes rust-lang#45728.

Modifies libterm to parse the extended terminfo format introduced in ncurses 6.1. This fixes the lack of color in test output for users with newer ncurses versions.

The ideal fix for this would be to migrate libtest to use `termcolor` (rust-lang#60349), but that's blocked for the foreseeable future.
…ifetime, r=petrochenkov

Forbid elided lifetimes within const generic parameter types

Disallows `fn foo<const T: &u32>()`, the lifetime must be explicitly given, i.e. `fn foo<const T: &'static u32>()`.

Fixes rust-lang#67883
…laumeGomez

rustdoc: HTML escape arrows on help popup

r? @GuillaumeGomez
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Contributor

bors commented Jan 13, 2020

📌 Commit 3163146 has been approved by Dylan-DPC

@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 Jan 13, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Jan 13, 2020
@bors
Copy link
Contributor

bors commented Jan 13, 2020

⌛ Testing commit 3163146 with merge aa0ff2027749d2c5977a3e36991633392176c33e...

@rust-highfive
Copy link
Collaborator

The job dist-x86_64-apple-alt 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-01-13T17:37:51.0452210Z [RUSTC-TIMING] git_rustfmt test:false 11.786
2020-01-13T17:37:52.9977170Z [RUSTC-TIMING] rustfmt test:false 13.740
2020-01-13T17:37:53.2241250Z [RUSTC-TIMING] cargo_fmt test:false 13.964
2020-01-13T17:37:53.2468570Z     Finished release [optimized] target(s) in 5m 27s
2020-01-13T17:37:53.2878680Z 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:
2020-01-13T17:37:53.2879890Z the following dependencies are duplicated although they have the same features enabled:
2020-01-13T17:37:53.2880210Z the following dependencies have different features:
2020-01-13T17:37:53.2880210Z the following dependencies have different features:
2020-01-13T17:37:53.2881450Z   proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)
2020-01-13T17:37:53.2882290Z     `rustfmt` additionally enabled features {"default"} at "/Users/runner/runners/2.163.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libproc_macro2-10a0b21f1377cd9a.rlib"
2020-01-13T17:37:53.2883080Z     `cargo` additionally enabled features {} at "/Users/runner/runners/2.163.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libproc_macro2-7ee6985e7de5b685.rlib"
2020-01-13T17:37:53.2883700Z   quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)
2020-01-13T17:37:53.2884470Z     `rustfmt` additionally enabled features {"default"} at "/Users/runner/runners/2.163.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libquote-cc3fed200f7ff633.rlib"
2020-01-13T17:37:53.2885240Z     `cargo` additionally enabled features {} at "/Users/runner/runners/2.163.1/work/1/s/build/x86_64-apple-darwin/stage1-tools/x86_64-apple-darwin/release/deps/libquote-38f3d268b489fc4a.rlib"
2020-01-13T17:37:53.2885340Z 
2020-01-13T17:37:53.2886020Z 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
2020-01-13T17:37:53.2886710Z thread 'main' panicked at 'tools should not compile multiple copies of the same crate', src/bootstrap/tool.rs:195:13
2020-01-13T17:37:53.3005640Z failed to run: /Users/runner/runners/2.163.1/work/1/s/build/bootstrap/debug/bootstrap dist
2020-01-13T17:37:53.3006720Z Build completed unsuccessfully in 1:20:57
2020-01-13T17:37:53.3083420Z == clock drift check ==
2020-01-13T17:37:53.3145250Z   local time: Mon Jan 13 17:37:53 UTC 2020
2020-01-13T17:37:53.3145250Z   local time: Mon Jan 13 17:37:53 UTC 2020
2020-01-13T17:37:53.3856380Z   network time: Mon, 13 Jan 2020 17:37:53 GMT
2020-01-13T17:37:53.3859240Z == end clock drift check ==
2020-01-13T17:37:53.3922360Z 
2020-01-13T17:37:53.4045220Z ##[error]Bash exited with code '1'.
2020-01-13T17:37:53.4111660Z ##[section]Starting: Checkout
2020-01-13T17:37:53.4119000Z ==============================================================================
2020-01-13T17:37:53.4119110Z Task         : Get sources
2020-01-13T17:37:53.4119190Z 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 Jan 13, 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 Jan 13, 2020
@JohnTitor
Copy link
Member

I left a comment on PR that seems to be the cause of the failure, closing.

@JohnTitor JohnTitor closed this Jan 13, 2020
@Dylan-DPC-zz Dylan-DPC-zz deleted the rollup-0cqu2uv branch January 14, 2020 05:43
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.

9 participants