about summary refs log tree commit diff
path: root/src/libcore/task
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-09 02:05:15 +0000
committerbors <bors@rust-lang.org>2020-01-09 02:05:15 +0000
commitadc65725004c8aac16392fe4052c3e347181157d (patch)
tree01f6119b01516f50953d5b4a1f3cfdb44bf6742a /src/libcore/task
parentcaa231d998a5e853c7ba1455d7a05b500df9d63c (diff)
parentb24de8f0f861781cd83018ad43d7aa9dd2cb55bb (diff)
downloadrust-adc65725004c8aac16392fe4052c3e347181157d.tar.gz
rust-adc65725004c8aac16392fe4052c3e347181157d.zip
Auto merge of #68034 - Centril:rollup-3d9pq14, r=Centril
Rollup of 12 pull requests

Successful merges:

 - #67630 (Treat extern statics just like statics in the "const pointer to static" representation)
 - #67747 (Explain that associated types and consts can't be accessed directly on the trait's path)
 - #67884 (Fix incremental builds of core by allowing unused attribute.)
 - #67966 (Use matches macro in libcore and libstd)
 - #67979 (Move `intravisit` => `rustc_hir` + misc cleanup)
 - #67986 (Display more informative ICE)
 - #67990 (slice patterns: harden match-based borrowck tests)
 - #68005 (Improve E0184 explanation)
 - #68009 (Spell check librustc_error_codes)
 - #68023 (Fix issue #68008)
 - #68024 (Remove `-Z continue-parse-after-error`)
 - #68026 (Small improvements in lexical_region_resolve)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libcore/task')
-rw-r--r--src/libcore/task/poll.rs5
1 files changed, 1 insertions, 4 deletions
diff --git a/src/libcore/task/poll.rs b/src/libcore/task/poll.rs
index d567ae54577..b3a4bd20b8f 100644
--- a/src/libcore/task/poll.rs
+++ b/src/libcore/task/poll.rs
@@ -39,10 +39,7 @@ impl<T> Poll<T> {
     #[inline]
     #[stable(feature = "futures_api", since = "1.36.0")]
     pub fn is_ready(&self) -> bool {
-        match *self {
-            Poll::Ready(_) => true,
-            Poll::Pending => false,
-        }
+        matches!(*self, Poll::Ready(_))
     }
 
     /// Returns `true` if this is `Poll::Pending`