about summary refs log tree commit diff
path: root/src/libsync
diff options
context:
space:
mode:
authorBarosl Lee <vcs@barosl.com>2014-11-12 03:36:09 +0900
committerBarosl Lee <vcs@barosl.com>2014-11-12 03:36:09 +0900
commit8bf77fa786aae4993fa923f0826529bfb9ce1166 (patch)
treea7ac9d644b4e116aa78ac337c749f73ebdcdadf3 /src/libsync
parent5d29209bda553e4d23a8b499d2ceb8db5c4f8be5 (diff)
downloadrust-8bf77fa786aae4993fa923f0826529bfb9ce1166.tar.gz
rust-8bf77fa786aae4993fa923f0826529bfb9ce1166.zip
Fix remaining documentation to reflect fail!() -> panic!()
Throughout the docs, "failure" was replaced with "panics" if it means a
task panic. Otherwise, it remained as is, or changed to "errors" to
clearly differentiate it from a task panic.
Diffstat (limited to 'src/libsync')
-rw-r--r--src/libsync/comm/mod.rs2
-rw-r--r--src/libsync/lock.rs4
2 files changed, 3 insertions, 3 deletions
diff --git a/src/libsync/comm/mod.rs b/src/libsync/comm/mod.rs
index 247f50d666e..65b3e30c2b9 100644
--- a/src/libsync/comm/mod.rs
+++ b/src/libsync/comm/mod.rs
@@ -43,7 +43,7 @@
 //!    "rendezvous" channel where each sender atomically hands off a message to
 //!    a receiver.
 //!
-//! ## Failure Propagation
+//! ## Panic Propagation
 //!
 //! In addition to being a core primitive for communicating in rust, channels
 //! are the points at which panics are propagated among tasks.  Whenever the one
diff --git a/src/libsync/lock.rs b/src/libsync/lock.rs
index a9b0b7c4803..0ef3e77da00 100644
--- a/src/libsync/lock.rs
+++ b/src/libsync/lock.rs
@@ -345,9 +345,9 @@ impl<T: Send + Sync> RWLock<T> {
     /// Access the underlying data immutably. May run concurrently with other
     /// reading tasks.
     ///
-    /// # Failure
+    /// # Panics
     ///
-    /// Failing will unlock the lock while unwinding. However, unlike all other
+    /// Panicking will unlock the lock while unwinding. However, unlike all other
     /// access modes, this will not poison the lock.
     pub fn read<'a>(&'a self) -> RWLockReadGuard<'a, T> {
         let guard = self.lock.read();