diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-04 10:54:35 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-04 11:13:12 -0700 |
| commit | 0c7c93b8e83544abc7eef5abd76526e5c49882f5 (patch) | |
| tree | 79768d11e65366724ca547ddd5c0bb8598303d4a /src/libstd/rt/rtio.rs | |
| parent | d130acc0d0e83bd0b4b94cda9d39dcbb67312526 (diff) | |
| download | rust-0c7c93b8e83544abc7eef5abd76526e5c49882f5.tar.gz rust-0c7c93b8e83544abc7eef5abd76526e5c49882f5.zip | |
std: Improve non-task-based usage
A few notable improvements were implemented to cut down on the number of aborts triggered by the standard library when a local task is not found. * Primarily, the unwinding functionality was restructured to support an unsafe top-level function, `try`. This function invokes a closure, capturing any failure which occurs inside of it. The purpose of this function is to be as lightweight of a "try block" as possible for rust, intended for use when the runtime is difficult to set up. This function is *not* meant to be used by normal rust code, nor should it be consider for use with normal rust code. * When invoking spawn(), a `fail!()` is triggered rather than an abort. * When invoking LocalIo::borrow(), which is transitively called by all I/O constructors, None is returned rather than aborting to indicate that there is no local I/O implementation. * Invoking get() on a TLD key will return None if no task is available * Invoking replace() on a TLD key will fail if no task is available. A test case was also added showing the variety of things that you can do without a runtime or task set up now. In general, this is just a refactoring to abort less quickly in the standard library when a local task is not found.
Diffstat (limited to 'src/libstd/rt/rtio.rs')
| -rw-r--r-- | src/libstd/rt/rtio.rs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/libstd/rt/rtio.rs b/src/libstd/rt/rtio.rs index a6c60df2642..06db465f7ee 100644 --- a/src/libstd/rt/rtio.rs +++ b/src/libstd/rt/rtio.rs @@ -171,7 +171,10 @@ impl<'a> LocalIo<'a> { // // In order to get around this, we just transmute a copy out of the task // in order to have what is likely a static lifetime (bad). - let mut t: Box<Task> = Local::take(); + let mut t: Box<Task> = match Local::try_take() { + Some(t) => t, + None => return None, + }; let ret = t.local_io().map(|t| { unsafe { mem::transmute_copy(&t) } }); |
