Rollup of 5 pull requests #97781
Closed
Rollup of 5 pull requests #97781
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
…and implicit provenance stripping where possible
Co-authored-by: Michael Goulet <[email protected]>
…=jsha Add empty impl blocks if they have documentation Fixes rust-lang#90866. The update for the test script is needed to count the number of impl blocks we have with only the struct. To be noted that with rust-lang#89676 merged, it wouldn't be needed (I don't know what is the status of it btw. cc ``@Mark-Simulacrum).`` It looks like this:  cc ``@jyn514`` r? ``@camelid``
… r=oli-obk interpret: better control over whether we read data with provenance The resolution in rust-lang/unsafe-code-guidelines#286 seems to be that when we load data at integer type, we implicitly strip provenance. So let's implement that in Miri at least for scalar loads. This makes use of the fact that `Scalar` layouts distinguish pointer-sized integers and pointers -- so I was expecting some wild bugs where layouts set this incorrectly, but so far that does not seem to happen. This does not entirely implement the solution to rust-lang/unsafe-code-guidelines#286; we still do the wrong thing for integers in larger types: we will `copy_op` them and then do validation, and validation will complain about the provenance. To fix that we need mutating validation; validation needs to strip the provenance rather than complaining about it. This is a larger undertaking (but will also help resolve rust-lang/miri#845 since we can reset padding to `Uninit`). The reason this is useful is that we can now implement `addr` as a `transmute` from a pointer to an integer, and actually get the desired behavior of stripping provenance without exposing it!
…h726 Do `suggest_await_before_try` with infer variables in self, and clean up binders Fixes rust-lang#97704 Also cleans up binders in this fn, since everything is a `Poly*` and we really shouldn't have stray escaping late-bound regions everywhere. That's why the function changed so much. This isn't necessary, so I can revert if necessary.
typo: `-Zcodegen-backend=llvm -Cpasses=list` should work now r? ``@bjorn3``
…compiler-errors
Suggest adding `{}` for `'label: non_block_expr`
Adds suggestions like this:
```text
help: consider enclosing expression in a block
|
3 | 'l {0};
| + +
```
inspired by rust-lang#48594 (comment)
r? `@compiler-errors`
rustbot
added
T-compiler
|
@bors r+ rollup |
|
📌 Commit d701e5b has been approved by |
bors
added
the
S-waiting-on-bors
|
@Dylan-DPC Why did you close #97766 (failed with timeout) and created the exact same size of rollup instead of retrying? And this is marked as rollup=always wrongly. |
|
@bors rollup=never p=5 |
|
@JohnTitor if a rollup has remained for a long time, i usually close it and create a new one because some of those might get merged, or r-'d or sometimes we may need a bigger rollup if queue is longer. (i know rollup pr does show if prs are merged or not) Choosing the same prs was purely accidental :P |
|
closing in favour of #97783 |
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:
suggest_await_before_trywith infer variables in self, and clean up binders #97721 (Dosuggest_await_before_trywith infer variables in self, and clean up binders)-Zcodegen-backend=llvm -Cpasses=listshould work now #97752 (typo:-Zcodegen-backend=llvm -Cpasses=listshould work now){}for'label: non_block_expr#97759 (Suggest adding{}for'label: non_block_expr)Failed merges:
r? @ghost
@rustbot modify labels: rollup
Create a similar rollup