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

Remove GenFuture from core #107445

Merged
merged 1 commit into from
Jan 31, 2023
Merged

Remove GenFuture from core #107445

merged 1 commit into from
Jan 31, 2023

Conversation

Swatinem
Copy link
Contributor

The handling of async constructs in the compiler does not rely on GenFuture anymore since 1.67, so this code can now be removed from core.

@Swatinem
Remove GenFuture from core
5372e66 
The handling of async constructs in the compiler does not rely on `GenFuture`
anymore since `1.67`, so this code can now be removed from `core`.
@rustbot
Copy link
Collaborator

rustbot commented Jan 29, 2023

r? @cuviper

(rustbot has picked a reviewer for you, use r? to override)

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Jan 29, 2023
@rustbot
Copy link
Collaborator

rustbot commented Jan 29, 2023

Hey! It looks like you've submitted a new PR for the library teams!

If this PR contains changes to any rust-lang/rust public library APIs then please comment with @rustbot label +T-libs-api -T-libs to tag it appropriately. If this PR contains changes to any unstable APIs please edit the PR description to add a link to the relevant API Change Proposal or create one if you haven't already. If you're unsure where your change falls no worries, just leave it as is and the reviewer will take a look and make a decision to forward on if necessary.

Examples of T-libs-api changes:

  • Stabilizing library features
  • Introducing insta-stable changes such as new implementations of existing stable traits on existing stable types
  • Introducing new or changing existing unstable library APIs (excluding permanently unstable features / features without a tracking issue)
  • Changing public documentation in ways that create new stability guarantees
  • Changing observable runtime behavior of library APIs

compiler-errors
compiler-errors reviewed Jan 30, 2023
View reviewed changes
library/core/src/future/mod.rs
task::Poll,
};

#[rustc_diagnostic_item = "gen_future"]
Copy link
Member

Choose a reason for hiding this comment

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

Is there any code that uses this diagnosics item?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I don’t think so, grepping through the whole codebase only yields leftover uses of the feature gate.

library/core/src/future/mod.rs
/// better error messages (`impl Future` rather than `GenFuture<[closure.....]>`).
// This is `const` to avoid extra errors after we recover from `const async fn`
#[doc(hidden)]
#[unstable(feature = "gen_future", issue = "50547")]
Copy link
Member

Choose a reason for hiding this comment

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

Is there some code that uses this feature gate? Possibly in ast lowering? Probably should remove that too.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The feature gate is still being used for the other implementation details of async lowering in this file.

@cuviper
Copy link
Member

cuviper commented Jan 30, 2023

LGTM!

@bors r+ rollup

@bors
Copy link
Contributor

bors commented Jan 30, 2023

📌 Commit 5372e66 has been approved by cuviper

It is now in the queue for this repository.

@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 Jan 30, 2023
@JohnTitor JohnTitor mentioned this pull request Jan 31, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jan 31, 2023
@bors
Auto merge of rust-lang#107498 - JohnTitor:rollup-2i6g4uk, r=JohnTitor
7c4a9a9 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#107245 (Implement unsizing in the new trait solver)
 - rust-lang#107445 (Remove `GenFuture` from core)
 - rust-lang#107473 (Update books)
 - rust-lang#107476 (rustdoc: remove unnecessary wrapper `div.item-decl` from HTML)
 - rust-lang#107477 (Migrate last part of CSS themes to CSS variables)
 - rust-lang#107479 (Use `ObligationCtxt::new_in_snapshot` in `satisfied_from_param_env`)
 - rust-lang#107482 (rustdoc: remove meta keywords from HTML)
 - rust-lang#107494 (fix link in std::path::Path::display())

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 39d2639 into rust-lang:master Jan 31, 2023
@rustbot rustbot added this to the 1.69.0 milestone Jan 31, 2023
@Swatinem Swatinem deleted the rm-genfuture branch February 1, 2023 13:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@compiler-errors compiler-errors compiler-errors left review comments

Assignees

@cuviper cuviper

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.69.0
Development

Successfully merging this pull request may close these issues.
5 participants
@Swatinem @rustbot @cuviper @bors @compiler-errors