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

Add Future and IntoFuture to the 2024 prelude #121041

Merged
merged 1 commit into from
Feb 19, 2024
Merged

Add Future and IntoFuture to the 2024 prelude #121041

merged 1 commit into from
Feb 19, 2024

Conversation

Noratrieb
Copy link
Member

Implements rust-lang/rfcs#3509.

@rustbot
Copy link
Collaborator

rustbot commented Feb 13, 2024

r? @cjgillot

rustbot has assigned @cjgillot.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue. labels Feb 13, 2024
This was referenced Feb 13, 2024
Closed
Merged
@Noratrieb
Copy link
Member Author

thanks rustbot for giving me a compiler reviewer because i touched ui tests
r? libs

@rustbot rustbot assigned Mark-Simulacrum and unassigned cjgillot Feb 13, 2024
@Veykril Veykril mentioned this pull request Feb 13, 2024
Open
15 tasks
@fmease
Copy link
Member

fmease commented Feb 13, 2024 •
edited
Loading

thanks rustbot for giving me a compiler reviewer because i touched ui tests

Since rustbot tries to find the largest diff to figure out the most appropriate code owner, of course you should've removed the two empty lines from the UI test to make it choose libs over compiler (9 lines libs, 10 → 8 lines compiler). It's your fault! 😝😂

@bors
Copy link
Contributor

bors commented Feb 14, 2024

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

@Mark-Simulacrum
Copy link
Member

r=me

@Mark-Simulacrum Mark-Simulacrum 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 Feb 18, 2024
@Noratrieb Noratrieb force-pushed the into-the-future-of-2024 branch 2 times, most recently from 64e0026 to 895c5b9 Compare February 18, 2024 21:20
@Noratrieb
Copy link
Member Author

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Feb 18, 2024

📌 Commit 895c5b9 has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 18, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Noratrieb
Copy link
Member Author

@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 Feb 18, 2024
@Noratrieb Noratrieb force-pushed the into-the-future-of-2024 branch from 895c5b9 to fd05db4 Compare February 18, 2024 21:37
@Noratrieb
Copy link
Member Author

@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Feb 18, 2024

📌 Commit fd05db4 has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 18, 2024
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Noratrieb
Copy link
Member Author

ok ok bors i am listening i will stop the eager r+
@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 Feb 18, 2024
@Noratrieb Noratrieb force-pushed the into-the-future-of-2024 branch from fd05db4 to 06f0edc Compare February 18, 2024 22:01
@Noratrieb Noratrieb force-pushed the into-the-future-of-2024 branch from 06f0edc to bd8a1a4 Compare February 18, 2024 22:20
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Noratrieb
Copy link
Member Author

🙏
@bors r=Mark-Simulacrum rollup

@bors
Copy link
Contributor

bors commented Feb 18, 2024

📌 Commit bd8a1a4 has been approved by Mark-Simulacrum

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Feb 18, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Feb 19, 2024
@matthiaskrgr
Rollup merge of rust-lang#121041 - Nilstrieb:into-the-future-of-2024,…
ce80454 
… r=Mark-Simulacrum

Add `Future` and `IntoFuture` to the 2024 prelude

Implements rust-lang/rfcs#3509.
This was referenced Feb 19, 2024
Closed
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2024
@bors
Auto merge of rust-lang#121295 - matthiaskrgr:rollup-j2vffew, r=matth…
e29a153 
…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#119808 (Store core::str::CharSearcher::utf8_size as u8)
 - rust-lang#121032 (Continue reporting remaining errors instead of silently dropping them)
 - rust-lang#121041 (Add `Future` and `IntoFuture` to the 2024 prelude)
 - rust-lang#121230 (Extend Level API)
 - rust-lang#121272 (Add diagnostic items for legacy numeric constants)
 - rust-lang#121275 (add test for panicking attribute macros)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit cf0b36a into rust-lang:master Feb 19, 2024
11 checks passed
@rustbot rustbot added this to the 1.78.0 milestone Feb 19, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 19, 2024
@rust-timer
Unrolled build for rust-lang#121041
96f9387 
Rollup merge of rust-lang#121041 - Nilstrieb:into-the-future-of-2024, r=Mark-Simulacrum

Add `Future` and `IntoFuture` to the 2024 prelude

Implements rust-lang/rfcs#3509.
@dtolnay dtolnay mentioned this pull request Mar 9, 2024
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels
A-testsuite Area: The testsuite used to check the correctness of rustc S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library team, which will review and decide on the PR/issue.
Projects
None yet
Milestone
1.78.0
Development

Successfully merging this pull request may close these issues.
7 participants
@Noratrieb @rustbot @fmease @bors @Mark-Simulacrum @rust-log-analyzer @cjgillot