about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2018-03-12 23:47:10 +0000
committerbors <bors@rust-lang.org>2018-03-12 23:47:10 +0000
commitc7cbe142640b2cea1eeb385249faffcf49f0990d (patch)
tree1a1177f544911d4739febbd995bddfc4c418edd9 /src/libstd
parent883e74645d350b6752cb94d48f46363f6f8789e9 (diff)
parent99d0ac0b65452642e56619a84e2b83717ee35297 (diff)
downloadrust-c7cbe142640b2cea1eeb385249faffcf49f0990d.tar.gz
rust-c7cbe142640b2cea1eeb385249faffcf49f0990d.zip
Auto merge of #48955 - kennytm:rollup, r=kennytm
Rollup of 13 pull requests

- Successful merges: #48201, #48705, #48725, #48824, #48877, #48880, #48887, #48928, #48934, #48480, #48631, #48898, #48954
- Failed merges:
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/fs.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/fs.rs b/src/libstd/fs.rs
index 292a78278ab..db52ed67d3a 100644
--- a/src/libstd/fs.rs
+++ b/src/libstd/fs.rs
@@ -453,6 +453,10 @@ impl File {
     /// will be extended to `size` and have all of the intermediate data filled
     /// in with 0s.
     ///
+    /// The file's cursor isn't changed. In particular, if the cursor was at the
+    /// end and the file is shrunk using this operation, the cursor will now be
+    /// past the end.
+    ///
     /// # Errors
     ///
     /// This function will return an error if the file is not opened for writing.