Skip to content

Rename IntoFuture::Future to IntoFuture::IntoFuture#94818

Merged
bors merged 1 commit intorust-lang:masterfrom
yoshuawuyts:into-future-associated-type
Mar 12, 2022
Merged

Rename IntoFuture::Future to IntoFuture::IntoFuture#94818
bors merged 1 commit intorust-lang:masterfrom
yoshuawuyts:into-future-associated-type

Conversation

@yoshuawuyts
Copy link
Member

@yoshuawuyts yoshuawuyts commented Mar 10, 2022 •
edited
Loading

Ref: #67644 (comment)

This renames IntoFuture::Future to IntoFuture::IntoFuture. This adds the Into* prefix to the associated type, similar to the IntoIterator::IntoIter associated type. It's my mistake we didn't do so in the first place. This fixes that and brings the two closer together. Thanks!

References

IntoIterator trait def

pub trait IntoIterator {
    type Item;
    type IntoIter: Iterator<Item = Self::Item>;
    fn into_iter(self) -> Self::IntoIter;
}

IntoFuture trait def

pub trait IntoFuture {
    type Output;
    type IntoFuture: Future<Output = Self::Output>; // Prior to this PR: `type Future:`
    fn into_future(self) -> Self::IntoFuture;
}

cc/ @eholk @rust-lang/wg-async

@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 10, 2022

r? @scottmcm

(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 Mar 10, 2022
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 10, 2022
@yoshuawuyts
Copy link
Member Author

yoshuawuyts commented Mar 10, 2022

This should probably be labeled T-libs, not T-compiler?

@Dylan-DPC Dylan-DPC added T-libs Relevant to the library team, which will review and decide on the PR/issue. and removed T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 10, 2022
@joshtriplett
Copy link
Member

joshtriplett commented Mar 11, 2022

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 11, 2022

📌 Commit 3f2cb6e has been approved by joshtriplett

@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 Mar 11, 2022
@Dylan-DPC Dylan-DPC mentioned this pull request Mar 11, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 11, 2022
@bors
Auto merge of rust-lang#94860 - Dylan-DPC:rollup-n06j8h6, r=Dylan-DPC
2c6a29a 
Rollup of 7 pull requests

Successful merges:

 - rust-lang#87618 (Add missing documentation for std::char types)
 - rust-lang#94769 (Collapse blanket and auto-trait impls by default)
 - rust-lang#94798 (`parse_tt` refactorings)
 - rust-lang#94818 (Rename `IntoFuture::Future` to `IntoFuture::IntoFuture`)
 - rust-lang#94827 (CTFE/Miri: detect out-of-bounds pointers in offset_from)
 - rust-lang#94838 (Make float parsing docs more comprehensive)
 - rust-lang#94839 (Suggest using double colon when a struct field type include single colon)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit fedf70a into rust-lang:master Mar 12, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 12, 2022
@yoshuawuyts yoshuawuyts deleted the into-future-associated-type branch March 14, 2022 13:14
@yoshuawuyts yoshuawuyts mentioned this pull request Mar 14, 2022
Merged
@WaffleLapkin WaffleLapkin mentioned this pull request Mar 21, 2022
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@scottmcm scottmcm

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-libs Relevant to the library team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.61.0

Development

Successfully merging this pull request may close these issues.

7 participants

@yoshuawuyts @rust-highfive @joshtriplett @bors @scottmcm @rustbot @Dylan-DPC