From 5a97036b6900ee208f90c52ceadcce606d497e93 Mon Sep 17 00:00:00 2001
From: Clar Charr <clar@charr.xyz>
Date: Sat, 20 May 2017 15:40:53 -0400
Subject: [PATCH 1/2] Convert Intos to Froms.

---
 src/liballoc/string.rs   | 6 +++---
 src/libstd/ffi/c_str.rs  | 6 +++---
 src/libstd/ffi/os_str.rs | 6 +++---
 src/libstd/path.rs       | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 2cb81029f95e2..c1ef1c2f96c73 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -2009,9 +2009,9 @@ impl From<Box<str>> for String {
 }
 
 #[stable(feature = "box_from_str", since = "1.18.0")]
-impl Into<Box<str>> for String {
-    fn into(self) -> Box<str> {
-        self.into_boxed_str()
+impl From<String> for Box<str> {
+    fn from(s: String) -> Box<str> {
+        s.into_boxed_str()
     }
 }
 
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 1a91417ca0e92..1586e0a4ddbd3 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -586,10 +586,10 @@ impl From<Box<CStr>> for CString {
 }
 
 #[stable(feature = "box_from_c_string", since = "1.18.0")]
-impl Into<Box<CStr>> for CString {
+impl From<CString> for Box<CStr> {
     #[inline]
-    fn into(self) -> Box<CStr> {
-        self.into_boxed_c_str()
+    fn from(s: CString) -> Box<CStr> {
+        s.into_boxed_c_str()
     }
 }
 
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index f54d79c201f48..3815f98668180 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -543,9 +543,9 @@ impl From<Box<OsStr>> for OsString {
 }
 
 #[stable(feature = "box_from_os_string", since = "1.18.0")]
-impl Into<Box<OsStr>> for OsString {
-    fn into(self) -> Box<OsStr> {
-        self.into_boxed_os_str()
+impl From<OsString> for Box<OsStr> {
+    fn from(s: OsString) -> Box<OsStr> {
+        s.into_boxed_os_str()
     }
 }
 
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index 42a54ed6d754c..e9bf7b33b8e42 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -1349,9 +1349,9 @@ impl From<Box<Path>> for PathBuf {
 }
 
 #[stable(feature = "box_from_path_buf", since = "1.18.0")]
-impl Into<Box<Path>> for PathBuf {
-    fn into(self) -> Box<Path> {
-        self.into_boxed_path()
+impl From<PathBuf> for Box<Path> {
+    fn from(p: PathBuf) -> Box<Path> {
+        p.into_boxed_path()
     }
 }
 

From 0d885efe16899c2dbad2918345c9ede7b83caa7f Mon Sep 17 00:00:00 2001
From: Oliver Middleton <olliemail27@gmail.com>
Date: Tue, 13 Jun 2017 00:08:37 +0100
Subject: [PATCH 2/2] Update version numbers for From impls

---
 src/liballoc/string.rs   | 2 +-
 src/libstd/ffi/c_str.rs  | 2 +-
 src/libstd/ffi/os_str.rs | 2 +-
 src/libstd/path.rs       | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index c1ef1c2f96c73..02ecb65fa38ff 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -2008,7 +2008,7 @@ impl From<Box<str>> for String {
     }
 }
 
-#[stable(feature = "box_from_str", since = "1.18.0")]
+#[stable(feature = "box_from_str", since = "1.20.0")]
 impl From<String> for Box<str> {
     fn from(s: String) -> Box<str> {
         s.into_boxed_str()
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index 1586e0a4ddbd3..5f0b11a616eb0 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -585,7 +585,7 @@ impl From<Box<CStr>> for CString {
     }
 }
 
-#[stable(feature = "box_from_c_string", since = "1.18.0")]
+#[stable(feature = "box_from_c_string", since = "1.20.0")]
 impl From<CString> for Box<CStr> {
     #[inline]
     fn from(s: CString) -> Box<CStr> {
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index 3815f98668180..3232a51546e72 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -542,7 +542,7 @@ impl From<Box<OsStr>> for OsString {
     }
 }
 
-#[stable(feature = "box_from_os_string", since = "1.18.0")]
+#[stable(feature = "box_from_os_string", since = "1.20.0")]
 impl From<OsString> for Box<OsStr> {
     fn from(s: OsString) -> Box<OsStr> {
         s.into_boxed_os_str()
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index e9bf7b33b8e42..7a8c89353940a 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -1348,7 +1348,7 @@ impl From<Box<Path>> for PathBuf {
     }
 }
 
-#[stable(feature = "box_from_path_buf", since = "1.18.0")]
+#[stable(feature = "box_from_path_buf", since = "1.20.0")]
 impl From<PathBuf> for Box<Path> {
     fn from(p: PathBuf) -> Box<Path> {
         p.into_boxed_path()