Skip to content

Commit

Permalink
Rollup merge of rust-lang#54203 - cuviper:stable-os_str_str_ref_eq, r…
Browse files Browse the repository at this point in the history
…=estebank

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.
  • Loading branch information
kennytm authored Sep 14, 2018
2 parents 8c999fa + 2e75b07 commit ae8410b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/libstd/ffi/os_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ae8410b

Please sign in to comment.