Rollup of 17 pull requests #48350
Closed
Rollup of 17 pull requests #48350
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
Member
Manishearth
commented
Feb 19, 2018
Manishearth
commented
- Successful merges: rustc_mir: handle all aggregate kinds in, and always run, the deaggregator. #48052, Fix nested impl trait lifetimes #48072, macros: improve struct constructor field hygiene, fix span bug #48082, Improve tuple struct field access hygiene #48083, Error on nested impl Trait and path projections from impl Trait #48084, rustdoc: move manual "extern crate" statements outside automatic "fn main"s in doctests #48106, detect wrong number of args when type-checking a closure #48123, Add Iterator::try_for_each #48157, incr.comp.: Don't keep RefCells in on-disk-cache borrowed in order to allow for recursive invocations. #48185, Allow two-phase borrows of &mut self in ops #48197, inform user where to give a type annotation #48198, incr.comp.: Store DepNode colors in a dense array instead of a hashmap. #48206, Turn feature-gate table into a query so it is covered by dependency tracking. #48208, Overhaul improper_ctypes output #48221, save-analysis: power through bracket mis-counts #48258, Fix broken documentation link. #48314, Implement implied shortcut links for intra-rustdoc-links #48335
- Failed merges:
Instead of creating inference variables for those argument types, use the trait error-reporting code to give a nicer error.
We need two-phase borrows of ops to be in the initial NLL release since without them lots of existing code will break. Fixes rust-lang#48129
…enums This dates back to at least rust-lang#26583. At the time, usize and isize were considered ffi-unsafe to nudge people away from them, but this changed in the aforementioned PR, making it inconsistent to complain about it in enum discriminants. In fact, repr(usize) is probably the best way to interface with `enum Foo : size_t { ... }`.
- Always name the non-FFI-safe - Explain *why* the type is not FFI-safe - Stop vaguely gesturing at structs/enums/unions if the non-FFI-safe types occured in a field. The last part is arguably a regression, but it's minor now that the non-FFI-safe type is actually named. Removing it avoids some code duplication.
The suggestion is unconditional, so following it could lead to further errors. This is already the case for the repr(C) suggestion, which makes this acceptable, though not *good*. Checking up-front whether the suggestion can help would be great but applies more broadly (and would require some refactoring to avoid duplicating the checks).
…objects It's unhelpful since raw pointers to trait objects are also FFI-unsafe and casting to a thin raw pointer loses the vtable. There are working solutions that _involve_ raw pointers but they're too complex to explain in one line and have serious trade offs.
This span covers the whole visibility expression: e.g. `pub (in path)`.
bors
added
the
S-waiting-on-review
|
@bors retry appveyor reached time limit :| |
bors
added
S-waiting-on-bors
|
⌛ Testing commit bbea863 with merge a9de713be72100a6aa3ca60aef7e88dc14ce23f4... |
|
☀️ Test successful - status-appveyor, status-travis |
|
wtf |
|
@bors retry |
|
⌛ Testing commit bbea863 with merge 4ce1b50a783dd3331ddb4d762a5628f90744dbf2... |
|
☀️ Test successful - status-appveyor, status-travis |
|
@bors retry |
|
⌛ Testing commit bbea863 with merge 4073992fd970a672c18bf4f8e621be031bdfe4f9... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
@bors retry time limit |
bors
added
S-waiting-on-bors
|
(eddyb's MIR PR is not in the rollup so I'll let that land first) |
bors
added a commit
that referenced
this pull request
Feb 20, 2018
|
💔 Test failed - status-appveyor |
bors
added
S-waiting-on-review
|
Hmm. Perhaps one of these pull requests negatively affects cycle times? Better to not roll up in that case :| Either that or we're just hitting the limits really often. |
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.