Rollup of 12 pull requests #68034
Merged
Rollup of 12 pull requests #68034
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
…c" representation
The same problem as in rust-lang#65023 was introduced by rust-lang#67657. This works around the current incrcomp issue with these attributes by allowing it here.
Found one wrongly spelled error message and decided to check all the error messages for wrongly spelled statements. Signed-off-by: wcampbell <[email protected]>
…n the trait's path
Fix Typo on hir::BinOpKind::Sub "substract" to "subtract" Fix Typo on "Error cannot substract" Fix Typo on cannot "substract"
…torino Treat extern statics just like statics in the "const pointer to static" representation fixes rust-lang#67612 r? @spastorino cc @RalfJung this does not affect runtime promotion at all. This is just about promotion within static item bodies.
Explain that associated types and consts can't be accessed directly on the trait's path Partially address rust-lang#44539.
Fix incremental builds of core by allowing unused attribute. I *think* that the same problem as in rust-lang#65023 was introduced by rust-lang#67657. This works around the current incrcomp issue with these attributes by allowing it here. This resolves the near-term issue for me, at least.
Use matches macro in libcore and libstd
This PR replaces matches like
```rust
match var {
value => true,
_ => false,
}
```
with use of `matches!` macro.
r? @Centril
Move `intravisit` => `rustc_hir` + misc cleanup Working towards rust-lang#65031. This should eventually enable getting rid of rustc as a dependency in various passes (e.g. lints). cc rust-lang#67806 (this also facilitates liberating lints from tcx) cc rust-lang#67922 (some other dep reductions) r? @Zoxc
Display more informative ICE Fixes rust-lang#66696
…, r=matthewjasper slice patterns: harden match-based borrowck tests This hardens some move-checking tests wrt. slice patterns and `match` expressions. r? @matthewjasper cc @pnkfelix cc rust-lang#67712 cc rust-lang#53114
…=Dylan-DPC Improve E0184 explanation r? @Dylan-DPC
…rror_codes, r=Centril Spell check librustc_error_codes Found one wrongly spelled error message and decided to check all the error messages for wrongly spelled statements.
Fix issue rust-lang#68008 Correcting Typo on error message. From "substract" to "subtract". Fixes rust-lang#68008.
Small improvements in lexical_region_resolve This just replaces a trivial `if` condition with a `|=` in two places. I could even have used a `fold` in the first case, but I think it would be less readable.
|
@bors r+ p=12 rollup=never |
|
📌 Commit b24de8f has been approved by |
bors
added
the
S-waiting-on-bors
bors
added a commit
that referenced
this pull request
Jan 9, 2020
Rollup of 12 pull requests Successful merges: - #67630 (Treat extern statics just like statics in the "const pointer to static" representation) - #67747 (Explain that associated types and consts can't be accessed directly on the trait's path) - #67884 (Fix incremental builds of core by allowing unused attribute.) - #67966 (Use matches macro in libcore and libstd) - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup) - #67986 (Display more informative ICE) - #67990 (slice patterns: harden match-based borrowck tests) - #68005 (Improve E0184 explanation) - #68009 (Spell check librustc_error_codes) - #68023 (Fix issue #68008) - #68024 (Remove `-Z continue-parse-after-error`) - #68026 (Small improvements in lexical_region_resolve) Failed merges: r? @ghost
|
☀️ Test successful - checks-azure |
|
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.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 |
This was referenced Jan 9, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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:
intravisit=>rustc_hir+ misc cleanup #67979 (Moveintravisit=>rustc_hir+ misc cleanup)-Z continue-parse-after-error#68024 (Remove-Z continue-parse-after-error)Failed merges:
r? @ghost