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

Spell out Self in async function return #72260

Merged
merged 6 commits into from
Jun 5, 2020
Merged

Spell out Self in async function return #72260

merged 6 commits into from
Jun 5, 2020

Conversation

csmoe
Copy link
Member

@csmoe csmoe commented May 16, 2020

Closes #69276
r? @tmandry

@rust-highfive
Copy link
Collaborator

Some changes occurred in diagnostic error codes

cc @GuillaumeGomez

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 16, 2020
@csmoe csmoe requested a review from GuillaumeGomez May 16, 2020 09:08
@csmoe csmoe force-pushed the issue-69276 branch 3 times, most recently from 8a64343 to 755ca01 Compare May 16, 2020 09:22
@rust-highfive

This comment has been minimized.

Sign in to view
@csmoe csmoe force-pushed the issue-69276 branch 3 times, most recently from 0c314b9 to 142b1d3 Compare May 16, 2020 11:59
@bors

This comment has been minimized.

Sign in to view
@csmoe csmoe force-pushed the issue-69276 branch 3 times, most recently from 84f6b27 to 2d9c166 Compare May 18, 2020 01:06
tmandry
tmandry reviewed May 18, 2020
View reviewed changes
src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved
src/librustc_typeck/check/mod.rs Outdated Show resolved Hide resolved
@tmandry
Copy link
Member

tmandry commented May 21, 2020

Looks good, thanks!

@bors r+

@bors
Copy link
Contributor

bors commented May 21, 2020

📌 Commit 2f311b0 has been approved by tmandry

@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-review Status: Awaiting review from the assignee but also interested parties. labels May 21, 2020
RalfJung added a commit to RalfJung/rust that referenced this pull request May 21, 2020
@RalfJung
Rollup merge of rust-lang#72260 - csmoe:issue-69276, r=tmandry
0aecafa 
Spell out `Self` in async function return

Closes rust-lang#69276
r? @tmandry
@RalfJung RalfJung mentioned this pull request May 21, 2020
Closed
@RalfJung
Copy link
Member

Failed in #72430 (comment)

tidy check
tidy error: duplicate error code: 755
tidy error: /checkout/src/librustc_error_codes/error_codes.rs:440: E0755: include_str!("./error_codes/E0755.md"),
tidy error: /checkout/src/librustc_error_codes/error_codes.rs:620:     E0755, // `#[ffi_pure]` is only allowed on foreign functions
Checking which error codes lack tests...
some tidy checks failed
Found 496 error codes
Found 0 error codes with no tests
Done!

@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 May 21, 2020
@csmoe
Copy link
Member Author

csmoe commented May 22, 2020

r? @RalfJung
error codes updated

@rust-highfive rust-highfive assigned RalfJung and unassigned tmandry May 22, 2020
@RalfJung
Copy link
Member

Sorry, I can't review this, I don't know the code. I just saw a failure during a rollup.
r? @tmandry

@rust-highfive rust-highfive assigned tmandry and unassigned RalfJung May 22, 2020
@csmoe
Copy link
Member Author

csmoe commented May 29, 2020

@tmandry ping

@csmoe
Copy link
Member Author

csmoe commented Jun 3, 2020

This PR was approved, but dequeued from the merging list as error-code conflict.
r? @estebank

@rust-highfive rust-highfive assigned estebank and unassigned tmandry Jun 3, 2020
@estebank
Copy link
Contributor

estebank commented Jun 3, 2020

@csmoe there's another PR that has taken E0758 already (and I have one open for E0759). Update and I'll r+

@csmoe
Copy link
Member Author

csmoe commented Jun 4, 2020

@estebank moved to E0760.

@estebank
Copy link
Contributor

estebank commented Jun 5, 2020

@bors r+

@bors
Copy link
Contributor

bors commented Jun 5, 2020

📌 Commit 9be6353 has been approved by estebank

@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 5, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 5, 2020
@Dylan-DPC
Rollup merge of rust-lang#72260 - csmoe:issue-69276, r=estebank
96ca604 
Spell out `Self` in async function return

Closes rust-lang#69276
r? @tmandry
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Jun 5, 2020
Closed
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Jun 5, 2020
@Dylan-DPC
Rollup merge of rust-lang#72260 - csmoe:issue-69276, r=estebank
9fcc7b8 
Spell out `Self` in async function return

Closes rust-lang#69276
r? @tmandry
This was referenced Jun 5, 2020
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jun 5, 2020
@bors
Auto merge of rust-lang#73025 - Dylan-DPC:rollup-a1uzj5u, r=Dylan-DPC
e412475 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#72260 (Spell out `Self` in async function return)
 - rust-lang#72996 (Remove unsused `NodeId` related APIs in hir map)
 - rust-lang#73010 (Update RELEASES.md)
 - rust-lang#73017 (Use assert_eq for liballoc test)
 - rust-lang#73019 (add test for rust-lang#72960)

Failed merges:

r? @ghost
@bors bors merged commit 14dc34d into rust-lang:master Jun 5, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@tmandry tmandry tmandry left review comments

@GuillaumeGomez GuillaumeGomez Awaiting requested review from GuillaumeGomez

Assignees

@estebank estebank

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
No milestone
Development

Successfully merging this pull request may close these issues.

Improve error message for "return type cannot contain a projection or Self..."
6 participants
@csmoe @rust-highfive @bors @tmandry @RalfJung @estebank