about summary refs log tree commit diff
path: root/src/libstd/process.rs
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-03-31 16:18:55 -0700
committerAlex Crichton <alex@alexcrichton.com>2015-03-31 16:18:55 -0700
commit50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (patch)
tree0546f83f5625d11fc4d5d9b2ad215a4ac3ce4778 /src/libstd/process.rs
parent85e997adfffa5e8511ff31710649038216028832 (diff)
parentac77392f8ab1c201b0c927f6a2d30b632b95acda (diff)
downloadrust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.tar.gz
rust-50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681.zip
rollup merge of #23919: alexcrichton/stabilize-io-error
Conflicts:
	src/libstd/fs/tempdir.rs
	src/libstd/io/error.rs
Diffstat (limited to 'src/libstd/process.rs')
-rw-r--r--src/libstd/process.rs1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/process.rs b/src/libstd/process.rs
index 63023855514..ca25cadb9dc 100644
--- a/src/libstd/process.rs
+++ b/src/libstd/process.rs
@@ -456,7 +456,6 @@ impl Child {
             return Err(Error::new(
                 ErrorKind::InvalidInput,
                 "invalid argument: can't kill an exited process",
-                None
             ))
         }