diff options
| author | bors <bors@rust-lang.org> | 2017-05-21 01:53:20 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-05-21 01:53:20 +0000 |
| commit | 7ac844ffb850a73b98cd47cbdec909d1f03c7987 (patch) | |
| tree | 45c04ee9ee8bea15018df1fc3ad800e05c057341 /src/libstd/path.rs | |
| parent | 92ee08ad1c1cbd0aa6e7b9a3f8295081439403fa (diff) | |
| parent | 382c0eb810b9cd9f1e944df629f14a2dae0b13f4 (diff) | |
| download | rust-7ac844ffb850a73b98cd47cbdec909d1f03c7987.tar.gz rust-7ac844ffb850a73b98cd47cbdec909d1f03c7987.zip | |
Auto merge of #42130 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 6 pull requests - Successful merges: #41892, #42062, #42091, #42093, #42098, #42127 - Failed merges:
Diffstat (limited to 'src/libstd/path.rs')
| -rw-r--r-- | src/libstd/path.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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() } |