Rollup of 9 pull requests #62542
Merged
Rollup of 9 pull requests #62542
Conversation
This file contains hidden or 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
TIL that debug_assert is implemented using `if cfg!(debug_assertions)` rather than `#[cfg(debug_assertions)]`. This means one can not use API gated with `#[cfg(debug_assertions)]` in `debug_assert` family of macros.
Looks like some env vars were tweaked on Azure's side of things, so update how we configure `CI_JOB_NAME`.
Co-Authored-By: Mazdak Farrokhzad <twingoow@gmail.com>
…nkfelix Fix ICEs when `Self` is used in type aliases I think it is right just to disallow this at resolution stage rather than let typeck produce a cyclic error. This is in line with previous behaviour. There was probably no need at all for the change that introduced this bug in rust-lang#57428, so I've simply reversed it. Fixes rust-lang#62263, rust-lang#62364, rust-lang#62305. r? @eddyb
Raise the default recursion limit to 128 The previous limit of 64 is being (just) barely hit by genuine code out there, which is causing issues like rust-lang#62059 to rear their end. Ideally, we wouldn’t have such arbitrary limits at all, but while we do, it makes a lot of sense to just raise this limit whenever genuine use-cases end up hitting it. r? @pnkfelix Fixes rust-lang#62059
Prevent shrinking of "crate select" element on Firefox This fixes rust-lang#60368
cli: make help output for -l and -L consistent
…crichton Regression test for issue 42574. Cc rust-lang#42574. I'm not going to say this *closes* that issue yet, for two reasons: 1. I am still confused about some aspects of the behavior we are observing that bug 2. The "fix" to the diagnostic relies on full NLL (`#![feature(nll)]`); migration mode still has a subpar diagnostic.
…_compiler_messages_p4, r=Centril normalize use of backticks in compiler messages for libsyntax/feature_gate.rs rust-lang#60532
clarify that debug_assert does not completely omits the code TIL that debug_assert is implemented using `if cfg!(debug_assertions)` rather than `#[cfg(debug_assertions)]`. This means one can not use API gated with `#[cfg(debug_assertions)]` in `debug_assert` family of macros.
…lbini ci: Configure $CI_JOB_NAME correctly Looks like some env vars were tweaked on Azure's side of things, so update how we configure `CI_JOB_NAME`.
Add spastorino for rustc-guide toolstate cc @spastorino r? @Centril
Contributor Author
| @bors r+ p=9 rollup=never |
Collaborator
| 📌 Commit e8cf614 has been approved by |
bors added the S-waiting-on-bors Collaborator
bors added a commit that referenced this pull request Jul 9, 2019
Rollup of 9 pull requests Successful merges: - #62417 (Fix ICEs when `Self` is used in type aliases) - #62450 (Raise the default recursion limit to 128) - #62470 (Prevent shrinking of "crate select" element on Firefox) - #62515 (cli: make help output for -l and -L consistent) - #62520 (Regression test for issue 42574.) - #62526 (normalize use of backticks in compiler messages for libsyntax/feature_gate.rs) - #62527 (clarify that debug_assert does not completely omits the code) - #62535 (ci: Configure $CI_JOB_NAME correctly) - #62541 (Add spastorino for rustc-guide toolstate) Failed merges: r? @ghost
Collaborator
| ☀️ Test successful - checks-azure, checks-travis, status-appveyor |
This was referenced Jul 10, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
10 participants
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:
Selfis used in type aliases #62417 (Fix ICEs whenSelfis used in type aliases)Failed merges:
r? @ghost