Rollup merge of rust-lang#54203 - cuviper:stable-os_str_str_ref_eq, r=estebank

kennytm · web-flow · commit ae8410bf2916 · 2018-09-14T14:50:15.000+08:00
Fix the stable release of os_str_str_ref_eq This was added and stabilized in commit 0250302, but while that claimed to be for 1.28.0, it didn't actually make it until 1.29.0. Fixes rust-lang#54195.
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
@@ -420,14 +420,14 @@ impl PartialEq<OsString> for str {
     }
 }
 
-#[stable(feature = "os_str_str_ref_eq", since = "1.28.0")]
+#[stable(feature = "os_str_str_ref_eq", since = "1.29.0")]
 impl<'a> PartialEq<&'a str> for OsString {
     fn eq(&self, other: &&'a str) -> bool {
         **self == **other
     }
 }
 
-#[stable(feature = "os_str_str_ref_eq", since = "1.28.0")]
+#[stable(feature = "os_str_str_ref_eq", since = "1.29.0")]
 impl<'a> PartialEq<OsString> for &'a str {
     fn eq(&self, other: &OsString) -> bool {
         **other == **self

Original file line number	Diff line number	Diff line change
`@@ -420,14 +420,14 @@ impl PartialEq<OsString> for str {`
`420`	`420`	`}`
`421`	`421`	`}`
`422`	`422`
`423`		`-#[stable(feature = "os_str_str_ref_eq", since = "1.28.0")]`
	`423`	`+#[stable(feature = "os_str_str_ref_eq", since = "1.29.0")]`
`424`	`424`	`impl<'a> PartialEq<&'a str> for OsString {`
`425`	`425`	`fn eq(&self, other: &&'a str) -> bool {`
`426`	`426`	`self == other`
`427`	`427`	`}`
`428`	`428`	`}`
`429`	`429`
`430`		`-#[stable(feature = "os_str_str_ref_eq", since = "1.28.0")]`
	`430`	`+#[stable(feature = "os_str_str_ref_eq", since = "1.29.0")]`
`431`	`431`	`impl<'a> PartialEq<OsString> for &'a str {`
`432`	`432`	`fn eq(&self, other: &OsString) -> bool {`
`433`	`433`	`other == self`