Skip to content

Commit

Permalink
Rollup merge of rust-lang#42127 - clarcharr:lifetimes, r=Mark-Simulacrum
Browse files Browse the repository at this point in the history
Remove unused lifetimes.

This was a typo that made it onto master. Noted by @dtolnay in rust-lang#42127.

Also note rust-lang#41960 which suggests warning these.
  • Loading branch information
Mark-Simulacrum authored May 20, 2017
2 parents 950e426 + 6119f98 commit 382c0eb
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/libstd/ffi/os_str.rs
Original file line number Diff line number Diff line change
Expand Up @@ -530,7 +530,7 @@ impl<'a> From<&'a OsStr> for Box<OsStr> {
}

#[stable(feature = "os_string_from_box", since = "1.18.0")]
impl<'a> From<Box<OsStr>> for OsString {
impl From<Box<OsStr>> for OsString {
fn from(boxed: Box<OsStr>) -> OsString {
boxed.into_os_string()
}
Expand Down
2 changes: 1 addition & 1 deletion src/libstd/path.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1342,7 +1342,7 @@ impl<'a> From<&'a Path> for Box<Path> {
}

#[stable(feature = "path_buf_from_box", since = "1.18.0")]
impl<'a> From<Box<Path>> for PathBuf {
impl From<Box<Path>> for PathBuf {
fn from(boxed: Box<Path>) -> PathBuf {
boxed.into_path_buf()
}
Expand Down

0 comments on commit 382c0eb

Please sign in to comment.