Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

rewrite combine doc comment #97874

Merged
merged 1 commit into from
Jun 9, 2022
Merged

rewrite combine doc comment #97874

merged 1 commit into from
Jun 9, 2022

Conversation

lcnr
Copy link
Contributor

@lcnr lcnr commented Jun 8, 2022

it was from 2014 and somewhat outdated

@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Jun 8, 2022
@rust-highfive
Copy link
Collaborator

r? @davidtwco

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 8, 2022
davidtwco
davidtwco approved these changes Jun 9, 2022
View reviewed changes
Copy link
Member

@davidtwco davidtwco left a comment

Choose a reason for hiding this comment

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

LGTM, r=me if you fix the nit or not.

compiler/rustc_infer/src/infer/combine.rs Outdated Show resolved Hide resolved
@davidtwco davidtwco 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-review Status: Awaiting review from the assignee but also interested parties. labels Jun 9, 2022
@lcnr
Copy link
Contributor Author

lcnr commented Jun 9, 2022

@bors r=davidtwco rollup

@bors
Copy link
Contributor

bors commented Jun 9, 2022

📌 Commit 36a4490 has been approved by davidtwco

@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 Jun 9, 2022
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Jun 9, 2022
@JohnTitor
Rollup merge of rust-lang#97874 - lcnr:combine-comment, r=davidtwco
8e7c5fa 
rewrite combine doc comment

it was from 2014 and somewhat outdated
@JohnTitor JohnTitor mentioned this pull request Jun 9, 2022
Closed
@JohnTitor JohnTitor mentioned this pull request Jun 9, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 9, 2022
@bors
Auto merge of rust-lang#97910 - JohnTitor:rollup-gu3k0xl, r=JohnTitor
a0411e2 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#95632 (impl Read and Write for VecDeque<u8>)
 - rust-lang#95860 (Stabilize `$$` in Rust 1.63.0)
 - rust-lang#97838 (hexagon: adapt test for upstream output changes)
 - rust-lang#97843 (Relax mipsel-sony-psp's linker script)
 - rust-lang#97874 (rewrite combine doc comment)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 141b0a4 into rust-lang:master Jun 9, 2022
@rustbot rustbot added this to the 1.63.0 milestone Jun 9, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@davidtwco davidtwco davidtwco approved these changes

Assignees

@davidtwco davidtwco

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.63.0
Development

Successfully merging this pull request may close these issues.
5 participants
@lcnr @rust-highfive @bors @davidtwco @rustbot