Skip to content

Clean up E0769 #76103

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

Jump to bottom
Merged
merged 1 commit into from
Sep 1, 2020
Merged

Clean up E0769 #76103

merged 1 commit into from
Sep 1, 2020

Conversation

GuillaumeGomez
Copy link
Member

pickfire
pickfire approved these changes Aug 30, 2020
View reviewed changes
Copy link
Contributor

@pickfire pickfire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

@Dylan-DPC-zz
Copy link

@bors r+ rollup

@bors
Copy link
Collaborator

bors commented Aug 30, 2020

📌 Commit 9f789828b6b583152a756a0b3bf024c58f2c3b87 has been approved by Dylan-DPC

@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 Aug 30, 2020
@bors
Copy link
Collaborator

bors commented Aug 30, 2020

☔ The latest upstream changes (presumably #74862) made this pull request unmergeable. Please resolve the merge conflicts.

@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 Aug 30, 2020
@GuillaumeGomez
Copy link
Member Author

@bors: r=Dylan-DPC rollup

@bors
Copy link
Collaborator

bors commented Aug 31, 2020

📌 Commit f3ae96e has been approved by Dylan-DPC

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Aug 31, 2020
@tmandry tmandry mentioned this pull request Sep 1, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 1, 2020
@bors
Auto merge of rust-lang#76186 - tmandry:rollup-49nliiy, r=tmandry
445f34b 
Rollup of 12 pull requests

Successful merges:

 - rust-lang#75945 (Use `env::func()`, not 'the function env::func' in docs for std::env)
 - rust-lang#76002 (Fix `-Z instrument-coverage` on MSVC)
 - rust-lang#76003 (Adds two source span utility functions used in source-based coverage)
 - rust-lang#76059 (Clean up E0764)
 - rust-lang#76103 (Clean up E0769)
 - rust-lang#76139 (Make `cow_is_borrowed` methods const)
 - rust-lang#76154 (Fix rustdoc strings indentation)
 - rust-lang#76161 (Remove notrust in rustc_middle)
 - rust-lang#76163 (README: Adjust Linux and macOS support platform and architecture)
 - rust-lang#76166 (Make `StringReader` private)
 - rust-lang#76172 (Revert rust-lang#75463)
 - rust-lang#76178 (Update expect-test to 1.0)

Failed merges:

r? @ghost
@bors bors merged commit 4f27620 into rust-lang:master Sep 1, 2020
@GuillaumeGomez GuillaumeGomez deleted the cleanup-e0769 branch September 1, 2020 08:23
@cuviper cuviper added this to the 1.48.0 milestone Nov 17, 2023
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@FedericoPonzi FedericoPonzi FedericoPonzi approved these changes

@pickfire pickfire pickfire approved these changes

Assignees
No one assigned
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.48.0
Development

Successfully merging this pull request may close these issues.
6 participants
@GuillaumeGomez @Dylan-DPC-zz @bors @FedericoPonzi @pickfire @cuviper