about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2019-02-12 05:50:26 +0000
committerbors <bors@rust-lang.org>2019-02-12 05:50:26 +0000
commit75f9159009cd0814bd6b5c3bf6a5406de7c4fe8d (patch)
treedbfb36089ef3b8fc32fc5127e206e775411ce821 /src/libstd
parentba2853b6d3a197cdbec5543be2592ca430b49af6 (diff)
parent33d2c9f5337215963d67d855f0c64919bd7407a4 (diff)
downloadrust-75f9159009cd0814bd6b5c3bf6a5406de7c4fe8d.tar.gz
rust-75f9159009cd0814bd6b5c3bf6a5406de7c4fe8d.zip
Auto merge of #58389 - Centril:rollup, r=Centril
Rollup of 11 pull requests

Successful merges:

 - #58105 (libarena => 2018)
 - #58111 (libterm => 2018)
 - #58287 (rustc-std-workspace-core => 2018)
 - #58288 (rustc-workspace-hack => 2018)
 - #58300 (librustc_typeck => 2018)
 - #58313 (Use `?` in librustc macros)
 - #58318 (libserialize => 2018)
 - #58322 (librustc_codegen_ssa => 2018)
 - #58342 (Revert removed #![feature(nll)])
 - #58367 (Remove two dead functions.)
 - #58382 (docs: remove "experimental" wording from std::os::unix)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/unix/ext/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/ext/mod.rs b/src/libstd/sys/unix/ext/mod.rs
index 36e9370b713..ccbac1a3e4b 100644
--- a/src/libstd/sys/unix/ext/mod.rs
+++ b/src/libstd/sys/unix/ext/mod.rs
@@ -1,4 +1,4 @@
-//! Experimental extensions to `std` for Unix platforms.
+//! Platform-specific extensions to `std` for Unix platforms.
 //!
 //! Provides access to platform-level information on Unix platforms, and
 //! exposes Unix-specific functions that would otherwise be inappropriate as