From 19d3dab31b1fca3abc3ba00173b9148bd70d24b0 Mon Sep 17 00:00:00 2001
From: Niko Matsakis <niko@alum.mit.edu>
Date: Wed, 1 Apr 2015 15:25:47 -0400
Subject: Collect the definition of the `Error` trait into `libstd` for now. 
 This sidesteps a coherence difficulty where `liballoc` had to prove that
 `&str: !Error`, which didn't involve any local types.

---
 src/libstd/lib.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/libstd/lib.rs')

diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 41ac3d60df5..807f0c5753e 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -183,7 +183,7 @@ pub use core::raw;
 pub use core::simd;
 pub use core::result;
 pub use core::option;
-pub use core::error;
+pub mod error;
 
 #[cfg(not(test))] pub use alloc::boxed;
 pub use alloc::rc;
-- 
cgit 1.4.1-3-g733a5