about summary refs log tree commit diff
path: root/src/libstd/condition.rs
diff options
context:
space:
mode:
authorPatrick Walton <pcwalton@mimiga.net>2013-11-22 14:15:32 -0800
committerPatrick Walton <pcwalton@mimiga.net>2013-11-26 08:25:27 -0800
commit151b7ed52d76a11a39888931056f1bcc9c45807a (patch)
tree614d773bfa0bcb8c1b93d4a6c4f824780f925f5b /src/libstd/condition.rs
parent749ee53c6d23ae1467568d6e0280a4f59e4e952b (diff)
downloadrust-151b7ed52d76a11a39888931056f1bcc9c45807a.tar.gz
rust-151b7ed52d76a11a39888931056f1bcc9c45807a.zip
libstd: Fix Win32 and other bustage.
Diffstat (limited to 'src/libstd/condition.rs')
-rw-r--r--src/libstd/condition.rs10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/condition.rs b/src/libstd/condition.rs
index 80ff104e830..e34e94ac10c 100644
--- a/src/libstd/condition.rs
+++ b/src/libstd/condition.rs
@@ -30,14 +30,14 @@ This macro declares an inner module called `my_error` with one static variable,
 parameters are used for, an example usage of this condition would be:
 
 ```rust
-do my_error::cond.trap(|raised_int| {
+my_error::cond.trap(|raised_int| {
 
     // the condition `my_error` was raised on, and the value it raised is stored
     // in `raised_int`. This closure must return a `~str` type (as specified in
     // the declaration of the condition
     if raised_int == 3 { ~"three" } else { ~"oh well" }
 
-}).inside {
+}).inside(|| {
 
     // The condition handler above is installed for the duration of this block.
     // That handler will override any previous handler, but the previous handler
@@ -50,7 +50,7 @@ do my_error::cond.trap(|raised_int| {
     println(my_error::cond.raise(3)); // prints "three"
     println(my_error::cond.raise(4)); // prints "oh well"
 
-}
+})
  ```
 
 Condition handling is useful in cases where propagating errors is either to
@@ -176,9 +176,9 @@ impl<'self, T, U> Trap<'self, T, U> {
     /// ```rust
     /// condition! { my_error: int -> int; }
     ///
-    /// let result = do my_error::cond.trap(|error| error + 3).inside {
+    /// let result = my_error::cond.trap(|error| error + 3).inside(|| {
     ///     my_error::cond.raise(4)
-    /// };
+    /// });
     /// assert_eq!(result, 7);
     /// ```
     pub fn inside<V>(&self, inner: 'self || -> V) -> V {