diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:18:55 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-03-31 16:18:55 -0700 |
| commit | 50b3ecf3bcc2e39a7a42e7f4b49f19398d5cc681 (patch) | |
| tree | 0546f83f5625d11fc4d5d9b2ad215a4ac3ce4778 /src/libstd/ffi | |
| parent | 85e997adfffa5e8511ff31710649038216028832 (diff) | |
| parent | ac77392f8ab1c201b0c927f6a2d30b632b95acda (diff) | |
| download | rust-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/ffi')
| -rw-r--r-- | src/libstd/ffi/c_str.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs index 42ea50bff77..de91e5f3268 100644 --- a/src/libstd/ffi/c_str.rs +++ b/src/libstd/ffi/c_str.rs @@ -241,7 +241,7 @@ impl fmt::Display for NulError { impl From<NulError> for io::Error { fn from(_: NulError) -> io::Error { io::Error::new(io::ErrorKind::InvalidInput, - "data provided contains a nul byte", None) + "data provided contains a nul byte") } } |