diff options
| author | bors <bors@rust-lang.org> | 2019-02-20 10:14:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-02-20 10:14:28 +0000 |
| commit | f66e4697ae286985ddefc53c3a047614568458bb (patch) | |
| tree | 656e63ba3f96698e771c822a90670f7eb608aa51 /src/libcore/future | |
| parent | 74e35d270067afff72034312065c48e6d8cfba67 (diff) | |
| parent | a1a17f5c6663a6a22a58505a6a925b44dfc016e9 (diff) | |
Auto merge of #58578 - kennytm:rollup, r=kennytm
Rollup of 24 pull requests
Successful merges:
- #56470 (Modify doctest's auto-`fn main()` to allow `Result`s)
- #58044 (Make overflowing and wrapping negation const)
- #58303 (Improve stability tags display)
- #58336 (Fix search results interactions)
- #58384 (Fix tables display)
- #58392 (Use less explicit shifting in std::net::ip)
- #58409 (rustdoc: respect alternate flag when formatting impl trait)
- #58456 (Remove no longer accurate diagnostic code about NLL)
- #58528 (Don't use an allocation for ItemId in StmtKind)
- #58530 (Monomorphize less code in fs::{read|write})
- #58534 (Mention capping forbid lints)
- #58536 (Remove UB in pointer tests)
- #58538 (Add missing fmt structs examples)
- #58539 (Add alias methods to PathBuf for underlying OsString (#58234))
- #58544 (Fix doc for rustc "-g" flag)
- #58545 (Add regression test for a specialization-related ICE (#39448))
- #58546 (librustc_codegen_llvm => 2018)
- #58551 (Explain a panic in test case net::tcp::tests::double_bind)
- #58553 (Use more impl header lifetime elision)
- #58562 (Fix style nits)
- #58565 (Fix typo in std::future::Future docs)
- #58568 (Fix a transposition in driver.rs.)
- #58569 (Reduce Some Code Repetitions like `(n << amt) >> amt`)
- #58576 (Stabilize iter::successors and iter::from_fn)
Diffstat (limited to 'src/libcore/future')
| -rw-r--r-- | src/libcore/future/future.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/future/future.rs b/src/libcore/future/future.rs index 02457e00054..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. /// @@ -92,7 +92,7 @@ pub trait Future { fn poll(self: Pin<&mut Self>, waker: &Waker) -> Poll<Self::Output>; } -impl<'a, F: ?Sized + Future + Unpin> Future for &'a mut F { +impl<F: ?Sized + Future + Unpin> Future for &mut F { type Output = F::Output; fn poll(mut self: Pin<&mut Self>, waker: &Waker) -> Poll<Self::Output> { |