diff options
| author | bors <bors@rust-lang.org> | 2016-05-09 16:11:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2016-05-09 16:11:51 -0700 |
| commit | e0fd34bba05cb43119abd6a45d3c33fcdf48c6b1 (patch) | |
| tree | bba6328b56f6a5e4086c4fb73ae57d55c20c3c31 /src/libstd/sync | |
| parent | 0e7cb8bc31413c9ea08c67c4d66318a7e9cbfb66 (diff) | |
| parent | 52f48bdcb5260fa82df840c8224338dd28b7b818 (diff) | |
| download | rust-e0fd34bba05cb43119abd6a45d3c33fcdf48c6b1.tar.gz rust-e0fd34bba05cb43119abd6a45d3c33fcdf48c6b1.zip | |
Auto merge of #33523 - Manishearth:rollup, r=Manishearth
Rollup of 10 pull requests - Successful merges: #33129, #33224, #33370, #33383, #33431, #33474, #33480, #33496, #33509, #33514 - Failed merges:
Diffstat (limited to 'src/libstd/sync')
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index dbcc2bc95bc..63b659d8db3 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -535,7 +535,7 @@ impl<T> Sender<T> { /// /// // This send will fail because the receiver is gone /// drop(rx); - /// assert_eq!(tx.send(1).err().unwrap().0, 1); + /// assert_eq!(tx.send(1).unwrap_err().0, 1); /// ``` #[stable(feature = "rust1", since = "1.0.0")] pub fn send(&self, t: T) -> Result<(), SendError<T>> { |