Auto merge of #2183 - RalfJung:better-provenance-control, r=RalfJung

[rust.git] / src / shims / os_str.rs

diff --git a/src/shims/os_str.rs b/src/shims/os_str.rs
index 8db75fed4a5f310f9d9c5c095da33ac97ec53b6e..d6669b21a731a8fde8b7e59d5d964bb7d3881b1e 100644 (file)
--- a/src/shims/os_str.rs
+++ b/src/shims/os_str.rs
@@ -78,7 +78,7 @@ pub fn u16vec_to_osstring<'tcx, 'a>(u16_vec: Vec<u16>) -> InterpResult<'tcx, OsS
             Ok(OsString::from_wide(&u16_vec[..]))
         }
         #[cfg(not(windows))]
-        pub fn u16vec_to_osstring<'tcx, 'a>(u16_vec: Vec<u16>) -> InterpResult<'tcx, OsString> {
+        pub fn u16vec_to_osstring<'tcx>(u16_vec: Vec<u16>) -> InterpResult<'tcx, OsString> {
             let s = String::from_utf16(&u16_vec[..])
                 .map_err(|_| err_unsup_format!("{:?} is not a valid utf-16 string", u16_vec))?;
             Ok(s.into())