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 12 pull requests #68034

Merged
merged 35 commits into from
Jan 9, 2020
Merged

Rollup of 12 pull requests #68034

merged 35 commits into from
Jan 9, 2020

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Jan 8, 2020

Successful merges:

Failed merges:

r? @ghost

oli-obk and others added 30 commits December 26, 2019 14:50
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]>
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
…, 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
…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.
Remove `-Z continue-parse-after-error`

We are just always recovering and continuing now.

r? @estebank @Centril
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.
@Centril
Copy link
Contributor Author

Centril commented Jan 8, 2020

@bors r+ p=12 rollup=never

@bors
Copy link
Contributor

bors commented Jan 8, 2020

📌 Commit b24de8f has been approved by Centril

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

bors commented Jan 9, 2020

⌛ Testing commit b24de8f with merge adc6572...

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
@bors
Copy link
Contributor

bors commented Jan 9, 2020

☀️ Test successful - checks-azure
Approved by: Centril
Pushing adc6572 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 9, 2020
@bors bors merged commit b24de8f into rust-lang:master Jan 9, 2020
@rust-highfive
Copy link
Collaborator

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 @TimNN. (Feature Requests)

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.