about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-08-08 09:06:45 +0000
committerbors <bors@rust-lang.org>2019-08-08 09:06:45 +0000
commit2628f579f6246df385acf9203bf2ffb6aedf5ccc (patch)
treefd559808122d5b25cf55beb791a95cdadbabfa1c /src/libstd
parent04523404bcae5904fe29a54122040a7101f5c652 (diff)
parent83fbf620a009e3fc998bb08098655dcfb7ff809b (diff)
downloadrust-2628f579f6246df385acf9203bf2ffb6aedf5ccc.tar.gz
rust-2628f579f6246df385acf9203bf2ffb6aedf5ccc.zip
Auto merge of #63371 - Centril:rollup-k0xtdcz, r=Centril
Rollup of 7 pull requests

Successful merges:

 - #62994 (Add test for #43398)
 - #63259 (Add tests for some issues)
 - #63327 (doc: Reword deprecation message of MetadataExt::as_raw_stat)
 - #63331 (Test conditional initialization validation in async fns)
 - #63334 (Update to rustc-guide that passes toolstate)
 - #63353 (Update books)
 - #63360 (Use consistent capitalization in -C/-Z help)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/os/linux/fs.rs7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/libstd/os/linux/fs.rs b/src/libstd/os/linux/fs.rs
index ec5e9837076..78321ac3185 100644
--- a/src/libstd/os/linux/fs.rs
+++ b/src/libstd/os/linux/fs.rs
@@ -34,9 +34,10 @@ pub trait MetadataExt {
     /// }
     /// ```
     #[stable(feature = "metadata_ext", since = "1.1.0")]
-    #[rustc_deprecated(since = "1.8.0",
-                       reason = "deprecated in favor of the accessor \
-                                 methods of this trait")]
+    #[rustc_deprecated(
+        since = "1.8.0",
+        reason = "other methods of this trait are now prefered"
+    )]
     #[allow(deprecated)]
     fn as_raw_stat(&self) -> &raw::stat;