From c160192f5f26279eb065a163e651ce610247b108 Mon Sep 17 00:00:00 2001
From: Simon Sapin <simon.sapin@exyr.org>
Date: Mon, 8 Jun 2015 16:55:35 +0200
Subject: Replace usage of String::from_str with String:from

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

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

diff --git a/src/libstd/error.rs b/src/libstd/error.rs
index 6d23df97000..328c75b6d9e 100644
--- a/src/libstd/error.rs
+++ b/src/libstd/error.rs
@@ -121,7 +121,7 @@ impl From<String> for Box<Error + Send + Sync> {
 #[stable(feature = "rust1", since = "1.0.0")]
 impl<'a, 'b> From<&'b str> for Box<Error + Send + Sync + 'a> {
     fn from(err: &'b str) -> Box<Error + Send + Sync + 'a> {
-        From::from(String::from_str(err))
+        From::from(String::from(err))
     }
 }
 
-- 
cgit 1.4.1-3-g733a5