diff options
| author | bors <bors@rust-lang.org> | 2014-10-14 04:02:48 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-10-14 04:02:48 +0000 |
| commit | a1e2eb0395941f5ca79cd59c8ab0a9f3133a2df0 (patch) | |
| tree | 2782a6efa84382e234077244930b2d78d54ce7ee /src/libstd/path | |
| parent | 1c3ddd297128a96f72be09bddf138e4e603a7aa1 (diff) | |
| parent | 2e2d681d88d99c4bb7033b852f98d6f979af5672 (diff) | |
| download | rust-a1e2eb0395941f5ca79cd59c8ab0a9f3133a2df0.tar.gz rust-a1e2eb0395941f5ca79cd59c8ab0a9f3133a2df0.zip | |
auto merge of #18017 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/posix.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/path/posix.rs b/src/libstd/path/posix.rs index f7fb9adb1fb..27eafdab642 100644 --- a/src/libstd/path/posix.rs +++ b/src/libstd/path/posix.rs @@ -775,7 +775,7 @@ mod tests { t!(s: "a/b/c", ["d".to_string(), "e".to_string()], "a/b/c/d/e"); t!(v: b"a/b/c", [b"d", b"e"], b"a/b/c/d/e"); t!(v: b"a/b/c", [b"d", b"/e", b"f"], b"/e/f"); - t!(v: b"a/b/c", [Vec::from_slice(b"d"), Vec::from_slice(b"e")], b"a/b/c/d/e"); + t!(v: b"a/b/c", [b"d".to_vec(), b"e".to_vec()], b"a/b/c/d/e"); } #[test] @@ -879,7 +879,7 @@ mod tests { t!(s: "a/b/c", ["d", "/e", "f"], "/e/f"); t!(s: "a/b/c", ["d".to_string(), "e".to_string()], "a/b/c/d/e"); t!(v: b"a/b/c", [b"d", b"e"], b"a/b/c/d/e"); - t!(v: b"a/b/c", [Vec::from_slice(b"d"), Vec::from_slice(b"e")], b"a/b/c/d/e"); + t!(v: b"a/b/c", [b"d".to_vec(), b"e".to_vec()], b"a/b/c/d/e"); } #[test] |