about summary refs log tree commit diff
path: root/src/libserialize
diff options
context:
space:
mode:
authorkennytm <kennytm@gmail.com>2018-08-17 00:13:19 +0800
committerGitHub <noreply@github.com>2018-08-17 00:13:19 +0800
commit07ce2a35180bf7c8ce05ac45993ee34f65612b65 (patch)
tree2c3657b217eb92e03a55918627c7eb6ecdc42f30 /src/libserialize
parent50503497492e9bab8bc8c5ad3fe403a3a80276d3 (diff)
parent352b2e72f486c9000c688fd11fe399315e5a02ed (diff)
downloadrust-07ce2a35180bf7c8ce05ac45993ee34f65612b65.tar.gz
rust-07ce2a35180bf7c8ce05ac45993ee34f65612b65.zip
Rollup merge of #52946 - Ajacmac:doc-impl-from, r=GuillaumeGomez
Documented impl From on line 367 of libserialize/json.rs

This is for the impl From mentioned in #51430 assigned to @skade .

Hopefully I didn't miss anything/get anything wrong. I looked over another PR for another part of this same issue to see what the proper formatting was, etc.

Thanks!
Diffstat (limited to 'src/libserialize')
-rw-r--r--src/libserialize/json.rs3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs
index 0361718eb73..00ccd062e0a 100644
--- a/src/libserialize/json.rs
+++ b/src/libserialize/json.rs
@@ -365,6 +365,9 @@ impl std::error::Error for EncoderError {
 }
 
 impl From<fmt::Error> for EncoderError {
+    /// Converts a [`fmt::Error`] into `EncoderError`
+    ///
+    /// This conversion does not allocate memory.
     fn from(err: fmt::Error) -> EncoderError { EncoderError::FmtError(err) }
 }