diff options
| author | bors <bors@rust-lang.org> | 2024-04-09 12:11:23 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-09 12:11:23 +0000 |
| commit | ff24ef91fc848832a8dab483d3b17097cbead5a8 (patch) | |
| tree | 415a450077c984ee7acecd287810da2e0ea211cb /library/core/src | |
| parent | 2805aedf9f847039325ebf9d7d36d4f24476b13b (diff) | |
| parent | ed43ac6b4546fa20709fe63b7a08e0ce49190209 (diff) | |
| download | rust-ff24ef91fc848832a8dab483d3b17097cbead5a8.tar.gz rust-ff24ef91fc848832a8dab483d3b17097cbead5a8.zip | |
Auto merge of #123676 - GuillaumeGomez:rollup-1hurixy, r=GuillaumeGomez
Rollup of 8 pull requests Successful merges: - #123254 (Do not allocate for ZST ThinBox (attempt 2 using const_allocate)) - #123626 (Add MC/DC support to coverage test tools) - #123638 (rustdoc: synthetic auto: filter out clauses from the implementor's ParamEnv) - #123653 (Split `non_local_definitions` lint tests in separate test files) - #123658 (Stop making any assumption about the projections applied to the upvars in the `ByMoveBody` pass) - #123662 (Don't rely on upvars being assigned just because coroutine-closure kind is assigned) - #123665 (Fix typo in `Future::poll()` docs) - #123672 (compiletest: unset `RUSTC_LOG_COLOR`) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'library/core/src')
| -rw-r--r-- | library/core/src/future/future.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/library/core/src/future/future.rs b/library/core/src/future/future.rs index 6dd3069034d..f965afc8a59 100644 --- a/library/core/src/future/future.rs +++ b/library/core/src/future/future.rs @@ -81,7 +81,7 @@ pub trait Future { /// An implementation of `poll` should strive to return quickly, and should /// not block. Returning quickly prevents unnecessarily clogging up /// threads or event loops. If it is known ahead of time that a call to - /// `poll` may end up taking awhile, the work should be offloaded to a + /// `poll` may end up taking a while, the work should be offloaded to a /// thread pool (or something similar) to ensure that `poll` can return /// quickly. /// |