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 10 pull requests #68201

Merged
merged 23 commits into from
Jan 14, 2020
Merged

Rollup of 10 pull requests #68201

merged 23 commits into from
Jan 14, 2020

Conversation

JohnTitor
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

ollie27 and others added 23 commits January 7, 2020 23:21
Add the option to report lints in external macros for rustc internal
lints
…acro-lints, r=petrochenkov

Use `report_in_external_macro` for internal lints

Add the option to report lints in external macros for rustc internal lints to resolve rust-lang#66370
…meGomez

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

Fixes rust-lang#67647

r? @GuillaumeGomez
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.
…lexcrichton

Clarify the relationship between `extended` and `tools` in `config.toml`

I.e. `tools` is only effective if `extended = true`. Alternatively, we could make `tools = []` by default and remove `extended` (although we'd want to list the possible options), but improving the description seems sufficient to solve the issue.

Fixes rust-lang#61194.
…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
Document behavior of set_nonblocking on UnixListener

The description on `set_nonblocking` in `UnixListener` was rather brief so I adapted it to be more like the documentation of  `set_nonblocking` in `TcpListener`.
…laumeGomez

rustdoc: HTML escape arrows on help popup

r? @GuillaumeGomez
Remove unneeded scope

Now, we can remove this scope.
…ark-Simulacrum

Tweak assertion note in format check

It's informative to tell the existence of `--bless` flag if we're running `tidy`.
@JohnTitor
Copy link
Member Author

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Jan 14, 2020

📌 Commit b8c0e31 has been approved by JohnTitor

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

bors commented Jan 14, 2020

⌛ Testing commit b8c0e31 with merge c06e4ac...

bors added a commit that referenced this pull request Jan 14, 2020
Rollup of 10 pull requests

Successful merges:

 - #67854 (Use `report_in_external_macro` for internal lints)
 - #67989 (rustdoc: Don't allow `#![feature(...)]` on stable or beta)
 - #68036 (libterm: parse extended terminfo format)
 - #68127 (Clarify the relationship between `extended` and `tools` in `config.toml`)
 - #68143 (Forbid elided lifetimes within const generic parameter types)
 - #68150 (Document behavior of set_nonblocking on UnixListener)
 - #68166 (rustdoc: HTML escape arrows on help popup)
 - #68176 (Clean up err codes)
 - #68179 (Remove unneeded scope)
 - #68188 (Tweak assertion note in format check)

Failed merges:

r? @ghost
@bors
Copy link
Contributor

bors commented Jan 14, 2020

☀️ Test successful - checks-azure
Approved by: JohnTitor
Pushing c06e4ac to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 14, 2020
@bors bors merged commit b8c0e31 into rust-lang:master Jan 14, 2020
@JohnTitor JohnTitor deleted the rollup-26e39gu branch January 14, 2020 10:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants