Rollup of 6 pull requests#68535
Closed
Dylan-DPC-zz wants to merge 23 commits intorust-lang:masterfrom
Closed
Conversation
The test fails on 1.36.0 but passes on master.
No longer suggest `Box::new(if foo { Type1 } else { Type2 })`, instead
suggesting `if foo { Box::new(Type1) } else { Box::new(Type2) }`.
When encountering a multipart suggestion with spans belonging to different contexts, skip that suggestion.
…akis add a test for rust-lang#60976 The test fails on 1.36.0 but passes on master. Huge thanks for @hellow554 actually digging out the minimized version of the repro. Fixes rust-lang#60976.
…Centril Add some type-alias-impl-trait regression tests Fixes rust-lang#57611 Fixes rust-lang#57807
Local is copy r? @oli-obk
Use Self instead of self return type
Further improve `impl Trait`/`dyn Trait` suggestions After reading [_Returning Trait Objects_ by Bryce Fisher-Fleig](https://bryce.fisher-fleig.org/blog/returning-trait-objects/), [I noticed that](https://www.reddit.com/r/rust/comments/esueur/returning_trait_objects/ffczl4k/) rust-lang#68195 had a few bugs due to not ignoring `ty::Error`. - Account for `ty::Error`. - Account for `if`/`else` and `match` blocks when pointing at return types and referencing their types. - Increase the multiline suggestion output from 6 lines to 20.
Do not ICE on multipart suggestions touching multiple files When encountering a multipart suggestion with spans belonging to different contexts, skip that suggestion. Fix rust-lang#68449. Similar to rust-lang#68256.
Author
|
@bors r+ rollup=never p=6 |
Collaborator
|
📌 Commit 0b68b78 has been approved by |
bors
added
the
S-waiting-on-bors
Collaborator
|
⌛ Testing commit 0b68b78 with merge d8b030b7dc2e2fd1b44f86de96bf4b7f69079313... |
Contributor
|
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 |
Collaborator
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
Contributor
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
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:
impl Trait/dyn Traitsuggestions #68522 (Further improveimpl Trait/dyn Traitsuggestions)Failed merges:
r? @ghost