about summary refs log tree commit diff
path: root/src/libstd/ffi
diff options
context:
space:
mode:
authorlukaramu <lukaramu@gmail.com>2017-02-19 15:36:28 +0100
committerlukaramu <lukaramu@gmail.com>2017-02-19 15:36:28 +0100
commit6a10e63ca0c79d9976a8d31daba064979736edd4 (patch)
treea2c4e34084ea2d00dddad15740df4f9b54c9ea8d /src/libstd/ffi
parent0128be9ad70970829420ed498d2f2943a72e1b62 (diff)
downloadrust-6a10e63ca0c79d9976a8d31daba064979736edd4.tar.gz
rust-6a10e63ca0c79d9976a8d31daba064979736edd4.zip
added Error and Display impl for std::ffi::FromBytesWithNulError
Diffstat (limited to 'src/libstd/ffi')
-rw-r--r--src/libstd/ffi/c_str.rs14
1 files changed, 14 insertions, 0 deletions
diff --git a/src/libstd/ffi/c_str.rs b/src/libstd/ffi/c_str.rs
index dc3855367ae..2c18250b87e 100644
--- a/src/libstd/ffi/c_str.rs
+++ b/src/libstd/ffi/c_str.rs
@@ -455,6 +455,20 @@ impl From<NulError> for io::Error {
     }
 }
 
+#[unstable(feature = "frombyteswithnulerror_impls", reason = "recently added", issue = "39925")]
+impl Error for FromBytesWithNulError {
+    fn description(&self) -> &str {
+        "data provided is not null terminated or contains an interior nul byte"
+    }
+}
+
+#[unstable(feature = "frombyteswithnulerror_impls", reason = "recently added", issue = "39925")]
+impl fmt::Display for FromBytesWithNulError {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        self.description().fmt(f)
+    }
+}
+
 impl IntoStringError {
     /// Consumes this error, returning original `CString` which generated the
     /// error.