diff options
| author | bors <bors@rust-lang.org> | 2023-10-25 17:35:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-10-25 17:35:01 +0000 |
| commit | cf226e93dcb0e21e2daa7c26aca0c5b46ff1b646 (patch) | |
| tree | e4e685975b8e96e150af566b912eb7d10583d05f /src | |
| parent | 964ff0125b0933699d5e1e796fcbdd72ef7246be (diff) | |
| parent | a7d05a6dfad6c1b2d77b25bdb70235e7e54c12ec (diff) | |
| download | rust-cf226e93dcb0e21e2daa7c26aca0c5b46ff1b646.tar.gz rust-cf226e93dcb0e21e2daa7c26aca0c5b46ff1b646.zip | |
Auto merge of #117172 - matthiaskrgr:rollup-s56bm2f, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #116801 (Add test for 113326) - #117133 (Merge `impl_wf_inference` (`check_mod_impl_wf`) check into coherence checking) - #117136 (Intern `LocalDefId` list from `opaque_types_defined_by` query) - #117150 (Update cargo) - #117158 (Update THIR unused_unsafe lint) - #117160 (Fix typo in test comment) - #117168 (Fix some coroutine sentences that don't make sense anymore.) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'src')
| -rw-r--r-- | src/doc/unstable-book/src/language-features/coroutines.md | 2 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 1 insertions, 1 deletions
diff --git a/src/doc/unstable-book/src/language-features/coroutines.md b/src/doc/unstable-book/src/language-features/coroutines.md index fb1ba791aef..f8e5a22fbd5 100644 --- a/src/doc/unstable-book/src/language-features/coroutines.md +++ b/src/doc/unstable-book/src/language-features/coroutines.md @@ -18,7 +18,7 @@ Coroutines are an extra-unstable feature in the compiler right now. Added in [RFC 2033] they're mostly intended right now as a information/constraint gathering phase. The intent is that experimentation can happen on the nightly compiler before actual stabilization. A further RFC will be required to -stabilize coroutines/coroutines and will likely contain at least a few small +stabilize coroutines and will likely contain at least a few small tweaks to the overall design. [RFC 2033]: https://github.com/rust-lang/rfcs/pull/2033 diff --git a/src/tools/cargo b/src/tools/cargo -Subproject d2f6a048529eb8e9ebc55d793abd63456c98fac +Subproject df3509237935f9418351b77803df7bc05c009b3 |