diff options
| author | bors <bors@rust-lang.org> | 2016-11-26 07:40:43 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-26 07:40:43 -0600 |
| commit | 7e39c0ede524e491cfd1898649115e03d4b22b53 (patch) | |
| tree | 1a5de822f4ab8986d731f642a7ff0ab92b9307cf /src/libstd/sync/mpsc | |
| parent | 73e98a0210f0afdec28b4f5bc0f7327d6a5a8555 (diff) | |
| parent | 44b926a6bbe3b8a48d077a72126b5921f87ece65 (diff) | |
| download | rust-7e39c0ede524e491cfd1898649115e03d4b22b53.tar.gz rust-7e39c0ede524e491cfd1898649115e03d4b22b53.zip | |
Auto merge of #38015 - sanxiyn:rollup, r=sanxiyn
Rollup of 7 pull requests - Successful merges: #37962, #37963, #37967, #37978, #37985, #38001, #38010 - Failed merges:
Diffstat (limited to 'src/libstd/sync/mpsc')
| -rw-r--r-- | src/libstd/sync/mpsc/mod.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/sync/mpsc/mod.rs b/src/libstd/sync/mpsc/mod.rs index 2773629c7d7..ca6e46eb15a 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -491,11 +491,11 @@ pub fn channel<T>() -> (Sender<T>, Receiver<T>) { /// becomes available. These channels differ greatly in the semantics of the /// sender from asynchronous channels, however. /// -/// This channel has an internal buffer on which messages will be queued. When -/// the internal buffer becomes full, future sends will *block* waiting for the -/// buffer to open up. Note that a buffer size of 0 is valid, in which case this -/// becomes "rendezvous channel" where each send will not return until a recv -/// is paired with it. +/// This channel has an internal buffer on which messages will be queued. `bound` +/// specifies the buffer size. When the internal buffer becomes full, future sends +/// will *block* waiting for the buffer to open up. Note that a buffer size of 0 +/// is valid, in which case this becomes "rendezvous channel" where each send will +/// not return until a recv is paired with it. /// /// As with asynchronous channels, all senders will panic in `send` if the /// `Receiver` has been destroyed. |
