about summary refs log tree commit diff
path: root/src/libstd/std.rs
diff options
context:
space:
mode:
authorMarvin Löbel <loebel.marvin@gmail.com>2013-10-11 23:20:34 +0200
committerMarvin Löbel <loebel.marvin@gmail.com>2013-10-28 08:50:32 +0100
commitfa8e71a8257f4226ab532d4bf268d3ecbfa98eb4 (patch)
tree0b8051814dd8a5ef08e663c172e2b456065d625d /src/libstd/std.rs
parentcb5b21eba713ff3888b2741db4c9e7d841cfde02 (diff)
downloadrust-fa8e71a8257f4226ab532d4bf268d3ecbfa98eb4.tar.gz
rust-fa8e71a8257f4226ab532d4bf268d3ecbfa98eb4.zip
Allow fail messages to be caught, and introduce the Any trait
Some code cleanup, sorting of import blocks

Removed std::unstable::UnsafeArc's use of Either

Added run-fail tests for the new FailWithCause impls

Changed future_result and try to return Result<(), ~Any>.

- Internally, there is an enum of possible fail messages passend around.
- In case of linked failure or a string message, the ~Any gets
  lazyly allocated in future_results recv method.
- For that, future result now returns a wrapper around a Port.
- Moved and renamed task::TaskResult into rt::task::UnwindResult
  and made it an internal enum.
- Introduced a replacement typedef `type TaskResult = Result<(), ~Any>`.
Diffstat (limited to 'src/libstd/std.rs')
-rw-r--r--src/libstd/std.rs14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/libstd/std.rs b/src/libstd/std.rs
index 12316cb5ead..069a390f010 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/std.rs
@@ -151,6 +151,7 @@ pub mod clone;
 pub mod hash;
 pub mod container;
 pub mod default;
+pub mod any;
 
 /* Common data structures */
 
@@ -213,15 +214,16 @@ mod std {
     pub use clone;
     pub use cmp;
     pub use condition;
-    pub use option;
+    pub use fmt;
     pub use kinds;
     pub use local_data;
     pub use logging;
-    pub use sys;
-    pub use unstable;
-    pub use str;
+    pub use logging;
+    pub use option;
     pub use os;
-    pub use fmt;
+    pub use str;
+    pub use sys;
     pub use to_bytes;
-    pub use logging;
+    pub use to_str;
+    pub use unstable;
 }