about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorMark Simulacrum <mark.simulacrum@gmail.com>2017-05-20 17:48:16 -0600
committerGitHub <noreply@github.com>2017-05-20 17:48:16 -0600
commit382c0eb810b9cd9f1e944df629f14a2dae0b13f4 (patch)
tree70e697f5dd5867b7d0950fb8b2eaf8656a706156 /src/libstd
parent950e4266e61def05d14f7729094afa2e7ad00eba (diff)
parent6119f9856cd7ed514656c19b56da65ea7bd7dd0a (diff)
downloadrust-382c0eb810b9cd9f1e944df629f14a2dae0b13f4.tar.gz
rust-382c0eb810b9cd9f1e944df629f14a2dae0b13f4.zip
Rollup merge of #42127 - clarcharr:lifetimes, r=Mark-Simulacrum
Remove unused lifetimes.

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

Also note #41960 which suggests warning these.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ffi/os_str.rs2
-rw-r--r--src/libstd/path.rs2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/ffi/os_str.rs b/src/libstd/ffi/os_str.rs
index eaf0502a577..f497734e249 100644
--- a/src/libstd/ffi/os_str.rs
+++ b/src/libstd/ffi/os_str.rs
@@ -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()
     }
diff --git a/src/libstd/path.rs b/src/libstd/path.rs
index e7d8c3007f6..e128a4164d7 100644
--- a/src/libstd/path.rs
+++ b/src/libstd/path.rs
@@ -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()
     }