diff options
| author | bors <bors@rust-lang.org> | 2016-07-02 03:18:59 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-02 03:18:59 -0700 |
| commit | 8a50e295fa2f3e550e1c9c19e1a9cadb6323ff40 (patch) | |
| tree | 14a69746e8efb85c86b6be4ce79a2908b61b5769 /src/libstd/path.rs | |
| parent | 2b59647fae4c8d1748d922ef30a872c7b2b5410d (diff) | |
| parent | adda4e41beb1d9821fb5efaa90897c81c87b47c8 (diff) | |
| download | rust-8a50e295fa2f3e550e1c9c19e1a9cadb6323ff40.tar.gz rust-8a50e295fa2f3e550e1c9c19e1a9cadb6323ff40.zip | |
Auto merge of #34611 - Manishearth:rollup, r=Manishearth
Rollup of 7 pull requests - Successful merges: #34531, #34545, #34551, #34566, #34567, #34574, #34583 - Failed merges:
Diffstat (limited to 'src/libstd/path.rs')
| -rw-r--r-- | src/libstd/path.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/path.rs b/src/libstd/path.rs index c103ff7f4b0..462e50a72cc 100644 --- a/src/libstd/path.rs +++ b/src/libstd/path.rs @@ -1057,7 +1057,6 @@ impl PathBuf { self._push(path.as_ref()) } - #[allow(deprecated)] fn _push(&mut self, path: &Path) { // in general, a separator is needed if the rightmost byte is not a separator let mut need_sep = self.as_mut_vec().last().map(|c| !is_sep_byte(*c)).unwrap_or(false); |