-
Notifications
You must be signed in to change notification settings - Fork 13.1k
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
Rollup of 10 pull requests #68201
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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
…r=Dylan-DPC Clean up err codes r? @Dylan-DPC
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`.
@bors r+ p=10 rollup=never |
📌 Commit b8c0e31 has been approved by |
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
☀️ Test successful - checks-azure |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Successful merges:
report_in_external_macro
for internal lints #67854 (Usereport_in_external_macro
for internal lints)#![feature(...)]
on stable or beta #67989 (rustdoc: Don't allow#![feature(...)]
on stable or beta)extended
andtools
inconfig.toml
#68127 (Clarify the relationship betweenextended
andtools
inconfig.toml
)Failed merges:
r? @ghost