Skip to content

Commit 12f3e45

Browse files
authoredFeb 16, 2017
Rollup merge of rust-lang#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.
2 parents a6b1c13 + b821313 commit 12f3e45

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed
 

‎src/libstd/sys/mod.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313
//! The `std::sys` module is the abstracted interface through which
1414
//! `std` talks to the underlying operating system. It has different
1515
//! implementations for different operating system families, today
16-
//! just Unix and Windows.
16+
//! just Unix and Windows, and initial support for Redox.
1717
//!
1818
//! The centralization of platform-specific code in this module is
1919
//! enforced by the "platform abstraction layer" tidy script in
20-
//! `tools/tidy/pal.rs`.
20+
//! `tools/tidy/src/pal.rs`.
2121
//!
2222
//! This module is closely related to the platform-independent system
2323
//! integration code in `std::sys_common`. See that module's
@@ -34,14 +34,14 @@
3434

3535
pub use self::imp::*;
3636

37-
#[cfg(target_os = "redox")]
38-
#[path = "redox/mod.rs"]
39-
mod imp;
40-
4137
#[cfg(unix)]
4238
#[path = "unix/mod.rs"]
4339
mod imp;
4440

4541
#[cfg(windows)]
4642
#[path = "windows/mod.rs"]
4743
mod imp;
44+
45+
#[cfg(target_os = "redox")]
46+
#[path = "redox/mod.rs"]
47+
mod imp;

0 commit comments

Comments
 (0)
Please sign in to comment.