Skip to content

Rollup of 2 pull requests #88923

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Closed

Conversation

workingjubilee
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

estebank and others added 4 commits September 12, 2021 18:49
Move object safety suggestions to the end of the error
Improve error message for missing trait in trait impl

Fixes rust-lang#88818. For the following example:
```rust
struct S { }
impl for S { }
```
the current output is:
```
error: missing trait in a trait impl
 --> t1.rs:2:5
  |
2 | impl for S { }
  |     ^
```
With my changes, I get:
```
error: missing trait in a trait impl
 --> t1.rs:2:5
  |
2 | impl for S { }
  |     ^
  |
help: add a trait here
  |
2 | impl Trait for S { }
  |      +++++
help: for an inherent impl, drop this `for`
  |
2 - impl for S { }
2 + impl S { }
  |
```
@rustbot rustbot added the rollup A PR which is a rollup label Sep 14, 2021
@workingjubilee
Copy link
Member Author

Testing a hypothesis that these PRs break each other.

@workingjubilee
Copy link
Member Author

Guess not.

@workingjubilee
Copy link
Member Author

....might as well?
@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Sep 14, 2021

📌 Commit 337ca88 has been approved by workingjubilee

@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 Sep 14, 2021
@bjorn3
Copy link
Member

bjorn3 commented Sep 14, 2021

#88894 was merged independently of this rollup half an hour ago.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 14, 2021
@workingjubilee
Copy link
Member Author

Weird.

@workingjubilee workingjubilee deleted the rollup-djo56bw branch September 14, 2021 21:37
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants