diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:00:20 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-02-17 19:42:28 -0800 |
| commit | 665ea963d3c29ef7670662707f2f2307f000efa3 (patch) | |
| tree | 9281d6d03436f1c92585c191a7a130d38e1ff9f0 /src/libstd/old_path | |
| parent | ba8ce4c2c27643cccfbbc481a19bcf4b7747cc89 (diff) | |
| download | rust-665ea963d3c29ef7670662707f2f2307f000efa3.tar.gz rust-665ea963d3c29ef7670662707f2f2307f000efa3.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/old_path')
| -rw-r--r-- | src/libstd/old_path/posix.rs | 2 | ||||
| -rw-r--r-- | src/libstd/old_path/windows.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/old_path/posix.rs b/src/libstd/old_path/posix.rs index 9bbce1934b0..440d17cfd50 100644 --- a/src/libstd/old_path/posix.rs +++ b/src/libstd/old_path/posix.rs @@ -520,7 +520,7 @@ mod tests { fn test_null_byte() { use thread; let result = thread::spawn(move|| { - Path::new(b"foo/bar\0") + Path::new(b"foo/bar\0"); }).join(); assert!(result.is_err()); diff --git a/src/libstd/old_path/windows.rs b/src/libstd/old_path/windows.rs index 8362e9a9530..07c5e10992b 100644 --- a/src/libstd/old_path/windows.rs +++ b/src/libstd/old_path/windows.rs @@ -1307,7 +1307,7 @@ mod tests { fn test_null_byte() { use thread; let result = thread::spawn(move|| { - Path::new(b"foo/bar\0") + Path::new(b"foo/bar\0"); }).join(); assert!(result.is_err()); |