std: Move sys_common to libstd/sys_common

Make the directory structure reflect the module structure. I've always found the existing structure confusing.
2016-09-30 23:26:44 +00:00 · 2016-09-30 23:26:44 +00:00 · ca30691813
commit ca30691813
parent f3a709dc52
20 changed files with 5 additions and 7 deletions
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@ -456,8 +456,7 @@ pub mod time;
 mod memchr;

 #[macro_use]
-#[path = "sys/common/mod.rs"] mod sys_common;
-
+mod sys_common;
 mod sys;

 pub mod rt;
--- a/src/libstd/sys_common/at_exit_imp.rs
+++ b/src/libstd/sys_common/at_exit_imp.rs
--- a/src/libstd/sys_common/backtrace.rs
+++ b/src/libstd/sys_common/backtrace.rs
--- a/src/libstd/sys_common/condvar.rs
+++ b/src/libstd/sys_common/condvar.rs
--- a/src/libstd/sys_common/gnu/libbacktrace.rs
+++ b/src/libstd/sys_common/gnu/libbacktrace.rs
--- a/src/libstd/sys_common/gnu/mod.rs
+++ b/src/libstd/sys_common/gnu/mod.rs
--- a/src/libstd/sys_common/io.rs
+++ b/src/libstd/sys_common/io.rs
--- a/src/libstd/sys_common/memchr.rs
+++ b/src/libstd/sys_common/memchr.rs
--- a/src/libstd/sys_common/mod.rs
+++ b/src/libstd/sys_common/mod.rs
--- a/src/libstd/sys_common/mutex.rs
+++ b/src/libstd/sys_common/mutex.rs
--- a/src/libstd/sys_common/net.rs
+++ b/src/libstd/sys_common/net.rs
--- a/src/libstd/sys_common/poison.rs
+++ b/src/libstd/sys_common/poison.rs
--- a/src/libstd/sys_common/remutex.rs
+++ b/src/libstd/sys_common/remutex.rs
--- a/src/libstd/sys_common/rwlock.rs
+++ b/src/libstd/sys_common/rwlock.rs
--- a/src/libstd/sys_common/thread.rs
+++ b/src/libstd/sys_common/thread.rs
--- a/src/libstd/sys_common/thread_info.rs
+++ b/src/libstd/sys_common/thread_info.rs
--- a/src/libstd/sys_common/thread_local.rs
+++ b/src/libstd/sys_common/thread_local.rs
--- a/src/libstd/sys_common/util.rs
+++ b/src/libstd/sys_common/util.rs
--- a/src/libstd/sys_common/wtf8.rs
+++ b/src/libstd/sys_common/wtf8.rs
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@ -57,9 +57,8 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
    "src/libpanic_abort",
    "src/libpanic_unwind",
    "src/libunwind",
-    "src/libstd/sys/unix", // This is where platform-specific code for unix
-    "src/libstd/sys/windows", // Ditto for windows
-    "src/libstd/sys/mod.rs", // This file chooses the platform
+    "src/libstd/sys/", // Platform-specific code for std lives here.
+                       // This has the trailing slash so that sys_common is not excepted.
    "src/libstd/os", // Platform-specific public interfaces
    "src/rtstartup", // Not sure what to do about this. magic stuff for mingw

@ -68,8 +67,8 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
    "src/libstd/path.rs",
    "src/libstd/num/f32.rs",
    "src/libstd/num/f64.rs",
-    "src/libstd/sys/common/mod.rs",
-    "src/libstd/sys/common/net.rs",
+    "src/libstd/sys_common/mod.rs",
+    "src/libstd/sys_common/net.rs",
    "src/libterm", // Not sure how to make this crate portable, but test needs it
    "src/libtest", // Probably should defer to unstable std::sys APIs