about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-01-29 13:40:58 +0000
committerbors <bors@rust-lang.org>2020-01-29 13:40:58 +0000
commiteed12bcd0cb281979c4c9ed956b9e41fda2bfaeb (patch)
treefdf73820fb17548b3ae1a65849819d42d1783dd5 /src/libstd
parentedb368491551a77d77a48446d4ee88b35490c565 (diff)
parent50df7880a77912702de51f454e58ae65a48d9e29 (diff)
downloadrust-eed12bcd0cb281979c4c9ed956b9e41fda2bfaeb.tar.gz
rust-eed12bcd0cb281979c4c9ed956b9e41fda2bfaeb.zip
Auto merge of #68635 - JohnTitor:rollup-jsc34ac, r=JohnTitor
Rollup of 7 pull requests

Successful merges:

 - #67722 (Minor: note how Any is an unsafe trait in SAFETY comments)
 - #68586 (Make conflicting_repr_hints a deny-by-default c-future-compat lint)
 - #68598 (Fix null synthetic_implementors error)
 - #68603 (Changelog: Demonstrate final build-override syntax)
 - #68609 (Set lld flavor for MSVC to link.exe)
 - #68611 (Correct ICE caused by macros generating invalid spans.)
 - #68627 (Document that write_all will not call write if given an empty buffer)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/io/mod.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/libstd/io/mod.rs b/src/libstd/io/mod.rs
index 95c8934b3d6..67b382c7a84 100644
--- a/src/libstd/io/mod.rs
+++ b/src/libstd/io/mod.rs
@@ -1327,6 +1327,8 @@ pub trait Write {
     /// not of [`ErrorKind::Interrupted`] kind generated from this method will be
     /// returned.
     ///
+    /// If the buffer contains no data, this will never call [`write`].
+    ///
     /// # Errors
     ///
     /// This function will return the first error of