diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 18:59:36 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-04-01 00:36:26 -0700 |
| commit | 8dff0ac143a689b7a1e04e55273d3f006b8369d1 (patch) | |
| tree | d8c010a3bf50657f6ffe46410948f7e53d81f72f /src/libstd/sys/windows/process.rs | |
| parent | 6ebb6e60b978ae3b27a0861d6d8eace03c7fce93 (diff) | |
| download | rust-8dff0ac143a689b7a1e04e55273d3f006b8369d1.tar.gz rust-8dff0ac143a689b7a1e04e55273d3f006b8369d1.zip | |
Test fixes and rebase conflicts
Diffstat (limited to 'src/libstd/sys/windows/process.rs')
| -rw-r--r-- | src/libstd/sys/windows/process.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/sys/windows/process.rs b/src/libstd/sys/windows/process.rs index 414083bc41f..b10042090dd 100644 --- a/src/libstd/sys/windows/process.rs +++ b/src/libstd/sys/windows/process.rs @@ -487,9 +487,9 @@ mod tests { #[test] fn test_make_command_line() { fn test_wrapper(prog: &str, args: &[&str]) -> String { - make_command_line(&CString::new(prog), + make_command_line(&CString::new(prog).unwrap(), &args.iter() - .map(|a| CString::new(a)) + .map(|a| CString::new(*a).unwrap()) .collect::<Vec<CString>>()) } |