about summary refs log tree commit diff
path: root/src/libstd/sys
diff options
context:
space:
mode:
authorCorey Farwell <coreyf@rwell.org>2017-02-15 23:48:20 -0500
committerGitHub <noreply@github.com>2017-02-15 23:48:20 -0500
commit12f3e45106c2e956b06c1cfcd78fbffb6105a3e8 (patch)
treecdf794ebb781653e0b691cd6565dcdbb44a81b97 /src/libstd/sys
parenta6b1c131a5785701084e2157d0f460b1f949e202 (diff)
parentb82131332706e5b39cb12186ce7ff6c682281464 (diff)
downloadrust-12f3e45106c2e956b06c1cfcd78fbffb6105a3e8.tar.gz
rust-12f3e45106c2e956b06c1cfcd78fbffb6105a3e8.zip
Rollup merge of #39844 - king6cong:sys, r=alexcrichton
sys/mod doc update and mod import order adjust

* Some doc updates.
* Racer currently use the first mod it finds regardless of cfg attrs. Moving #[cfg(unix)] up should be a temporary tweak that works as expected for more people.
Diffstat (limited to 'src/libstd/sys')
-rw-r--r--src/libstd/sys/mod.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/sys/mod.rs b/src/libstd/sys/mod.rs
index 14da376efa9..ef4dc365dbe 100644
--- a/src/libstd/sys/mod.rs
+++ b/src/libstd/sys/mod.rs
@@ -13,11 +13,11 @@
 //! The `std::sys` module is the abstracted interface through which
 //! `std` talks to the underlying operating system. It has different
 //! implementations for different operating system families, today
-//! just Unix and Windows.
+//! just Unix and Windows, and initial support for Redox.
 //!
 //! The centralization of platform-specific code in this module is
 //! enforced by the "platform abstraction layer" tidy script in
-//! `tools/tidy/pal.rs`.
+//! `tools/tidy/src/pal.rs`.
 //!
 //! This module is closely related to the platform-independent system
 //! integration code in `std::sys_common`. See that module's
@@ -34,10 +34,6 @@
 
 pub use self::imp::*;
 
-#[cfg(target_os = "redox")]
-#[path = "redox/mod.rs"]
-mod imp;
-
 #[cfg(unix)]
 #[path = "unix/mod.rs"]
 mod imp;
@@ -45,3 +41,7 @@ mod imp;
 #[cfg(windows)]
 #[path = "windows/mod.rs"]
 mod imp;
+
+#[cfg(target_os = "redox")]
+#[path = "redox/mod.rs"]
+mod imp;