diff options
| author | Matthew <mjjasper1@gmail.com> | 2017-04-24 10:20:05 +0100 |
|---|---|---|
| committer | Matthew <mjjasper1@gmail.com> | 2017-04-24 10:20:05 +0100 |
| commit | 158b085f06a41004ebf36d87afa3548f8b60861a (patch) | |
| tree | e035c4787385e562748f7a3d04bb4e5018f82767 /src/libstd/sync | |
| parent | 8a3ea01bcae85a3ed0c90ca5603cd88c469172c3 (diff) | |
| parent | 15ce54096a589de277771ad1f55a334fe2661a64 (diff) | |
| download | rust-158b085f06a41004ebf36d87afa3548f8b60861a.tar.gz rust-158b085f06a41004ebf36d87afa3548f8b60861a.zip | |
Fix more merge conflicts
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 852675edc02..6c8839224f7 100644 --- a/src/libstd/sync/mpsc/mod.rs +++ b/src/libstd/sync/mpsc/mod.rs @@ -452,7 +452,7 @@ pub struct SendError<T>(#[stable(feature = "rust1", since = "1.0.0")] pub T); /// An error returned from the [`recv`] function on a [`Receiver`]. /// /// The [`recv`] operation can only fail if the sending half of a -/// [`channel`] (or [`sync_channel`]) is disconnected, implying that no further +/// [`channel`][`channel`] (or [`sync_channel`]) is disconnected, implying that no further /// messages will ever be received. /// /// [`recv`]: struct.Receiver.html#method.recv |