about summary refs log tree commit diff
path: root/src/libstd/lib.rs
diff options
context:
space:
mode:
authorAaron Turon <aturon@mozilla.com>2014-10-03 14:23:09 -0700
committerAaron Turon <aturon@mozilla.com>2014-11-02 15:25:38 -0800
commit6815c2e8e8dae3d8dedfe95e985a79c57841bdb2 (patch)
tree38fb59aa600802ead160c0abfe2c69b7f5aec563 /src/libstd/lib.rs
parenta294b35060e069007ee46e190a6f0a19fa3eaab8 (diff)
downloadrust-6815c2e8e8dae3d8dedfe95e985a79c57841bdb2.tar.gz
rust-6815c2e8e8dae3d8dedfe95e985a79c57841bdb2.zip
Add error module with Error and FromError traits
As per [RFC 70](https://github.com/rust-lang/rfcs/blob/master/active/0070-error-chaining.md)

Closes #17747

Note that the `error` module must live in `std` in order to refer to `String`.

Note that, until multidispatch lands, the `FromError` trait cannot be
usefully implemented outside of the blanket impl given here.
Diffstat (limited to 'src/libstd/lib.rs')
-rw-r--r--src/libstd/lib.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 67080f4551f..f10a1d5e5ed 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -218,6 +218,7 @@ pub mod time;
 
 /* Common traits */
 
+pub mod error;
 pub mod from_str;
 pub mod num;
 pub mod to_string;
@@ -257,6 +258,7 @@ mod std {
     pub use hash;
 
     pub use comm; // used for select!()
+    pub use error; // used for try!()
     pub use fmt; // used for any formatting strings
     pub use io; // used for println!()
     pub use local_data; // used for local_data_key!()