about summary refs log tree commit diff
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2019-02-20 01:13:44 +0800
committerkennytm <kennytm@gmail.com>2019-02-20 11:59:17 +0800
commit09c85a1d22f6efe5a8e7dac21417cccee3e7ac9a (patch)
tree2e98d6f2ebb7a6f8c6bcccb572c0d4167b4f647f
parent6e991011dcb47c00cb44bc3427c22fca3b127414 (diff)
parent75c541f228be5c76e2b81971b4f11fd537b83eee (diff)
downloadrust-09c85a1d22f6efe5a8e7dac21417cccee3e7ac9a.tar.gz
rust-09c85a1d22f6efe5a8e7dac21417cccee3e7ac9a.zip
Rollup merge of #58565 - thomaseizinger:typo-future-docs, r=frewsxcv
Fix typo in std::future::Future docs

I am not quite sure if this is actually a typo but

1. to me the sentence doesn't make sense if it says "expect"
2. I hope that `Future`s are not really allowed to cause memory unsafety if they are polled after completion.
-rw-r--r--src/libcore/future/future.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libcore/future/future.rs b/src/libcore/future/future.rs
index 7beeffb1661..84e7147153e 100644
--- a/src/libcore/future/future.rs
+++ b/src/libcore/future/future.rs
@@ -81,7 +81,7 @@ pub trait Future {
     ///
     /// Once a future has completed (returned `Ready` from `poll`),
     /// then any future calls to `poll` may panic, block forever, or otherwise
-    /// cause any kind of bad behavior expect causing memory unsafety.
+    /// cause any kind of bad behavior except causing memory unsafety.
     /// The `Future` trait itself provides no guarantees about the behavior
     /// of `poll` after a future has completed.
     ///