From ca30691813836e1c6896e5ba5d4397eb717e7270 Mon Sep 17 00:00:00 2001 From: Brian Anderson Date: Fri, 30 Sep 2016 23:26:44 +0000 Subject: [PATCH] std: Move sys_common to libstd/sys_common Make the directory structure reflect the module structure. I've always found the existing structure confusing. --- src/libstd/lib.rs | 3 +-- src/libstd/{sys/common => sys_common}/at_exit_imp.rs | 0 src/libstd/{sys/common => sys_common}/backtrace.rs | 0 src/libstd/{sys/common => sys_common}/condvar.rs | 0 .../{sys/common => sys_common}/gnu/libbacktrace.rs | 0 src/libstd/{sys/common => sys_common}/gnu/mod.rs | 0 src/libstd/{sys/common => sys_common}/io.rs | 0 src/libstd/{sys/common => sys_common}/memchr.rs | 0 src/libstd/{sys/common => sys_common}/mod.rs | 0 src/libstd/{sys/common => sys_common}/mutex.rs | 0 src/libstd/{sys/common => sys_common}/net.rs | 0 src/libstd/{sys/common => sys_common}/poison.rs | 0 src/libstd/{sys/common => sys_common}/remutex.rs | 0 src/libstd/{sys/common => sys_common}/rwlock.rs | 0 src/libstd/{sys/common => sys_common}/thread.rs | 0 src/libstd/{sys/common => sys_common}/thread_info.rs | 0 src/libstd/{sys/common => sys_common}/thread_local.rs | 0 src/libstd/{sys/common => sys_common}/util.rs | 0 src/libstd/{sys/common => sys_common}/wtf8.rs | 0 src/tools/tidy/src/pal.rs | 9 ++++----- 20 files changed, 5 insertions(+), 7 deletions(-) rename src/libstd/{sys/common => sys_common}/at_exit_imp.rs (100%) rename src/libstd/{sys/common => sys_common}/backtrace.rs (100%) rename src/libstd/{sys/common => sys_common}/condvar.rs (100%) rename src/libstd/{sys/common => sys_common}/gnu/libbacktrace.rs (100%) rename src/libstd/{sys/common => sys_common}/gnu/mod.rs (100%) rename src/libstd/{sys/common => sys_common}/io.rs (100%) rename src/libstd/{sys/common => sys_common}/memchr.rs (100%) rename src/libstd/{sys/common => sys_common}/mod.rs (100%) rename src/libstd/{sys/common => sys_common}/mutex.rs (100%) rename src/libstd/{sys/common => sys_common}/net.rs (100%) rename src/libstd/{sys/common => sys_common}/poison.rs (100%) rename src/libstd/{sys/common => sys_common}/remutex.rs (100%) rename src/libstd/{sys/common => sys_common}/rwlock.rs (100%) rename src/libstd/{sys/common => sys_common}/thread.rs (100%) rename src/libstd/{sys/common => sys_common}/thread_info.rs (100%) rename src/libstd/{sys/common => sys_common}/thread_local.rs (100%) rename src/libstd/{sys/common => sys_common}/util.rs (100%) rename src/libstd/{sys/common => sys_common}/wtf8.rs (100%) diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs index 1d6c2403c2f..3eb82881090 100644 --- 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; diff --git a/src/libstd/sys/common/at_exit_imp.rs b/src/libstd/sys_common/at_exit_imp.rs similarity index 100% rename from src/libstd/sys/common/at_exit_imp.rs rename to src/libstd/sys_common/at_exit_imp.rs diff --git a/src/libstd/sys/common/backtrace.rs b/src/libstd/sys_common/backtrace.rs similarity index 100% rename from src/libstd/sys/common/backtrace.rs rename to src/libstd/sys_common/backtrace.rs diff --git a/src/libstd/sys/common/condvar.rs b/src/libstd/sys_common/condvar.rs similarity index 100% rename from src/libstd/sys/common/condvar.rs rename to src/libstd/sys_common/condvar.rs diff --git a/src/libstd/sys/common/gnu/libbacktrace.rs b/src/libstd/sys_common/gnu/libbacktrace.rs similarity index 100% rename from src/libstd/sys/common/gnu/libbacktrace.rs rename to src/libstd/sys_common/gnu/libbacktrace.rs diff --git a/src/libstd/sys/common/gnu/mod.rs b/src/libstd/sys_common/gnu/mod.rs similarity index 100% rename from src/libstd/sys/common/gnu/mod.rs rename to src/libstd/sys_common/gnu/mod.rs diff --git a/src/libstd/sys/common/io.rs b/src/libstd/sys_common/io.rs similarity index 100% rename from src/libstd/sys/common/io.rs rename to src/libstd/sys_common/io.rs diff --git a/src/libstd/sys/common/memchr.rs b/src/libstd/sys_common/memchr.rs similarity index 100% rename from src/libstd/sys/common/memchr.rs rename to src/libstd/sys_common/memchr.rs diff --git a/src/libstd/sys/common/mod.rs b/src/libstd/sys_common/mod.rs similarity index 100% rename from src/libstd/sys/common/mod.rs rename to src/libstd/sys_common/mod.rs diff --git a/src/libstd/sys/common/mutex.rs b/src/libstd/sys_common/mutex.rs similarity index 100% rename from src/libstd/sys/common/mutex.rs rename to src/libstd/sys_common/mutex.rs diff --git a/src/libstd/sys/common/net.rs b/src/libstd/sys_common/net.rs similarity index 100% rename from src/libstd/sys/common/net.rs rename to src/libstd/sys_common/net.rs diff --git a/src/libstd/sys/common/poison.rs b/src/libstd/sys_common/poison.rs similarity index 100% rename from src/libstd/sys/common/poison.rs rename to src/libstd/sys_common/poison.rs diff --git a/src/libstd/sys/common/remutex.rs b/src/libstd/sys_common/remutex.rs similarity index 100% rename from src/libstd/sys/common/remutex.rs rename to src/libstd/sys_common/remutex.rs diff --git a/src/libstd/sys/common/rwlock.rs b/src/libstd/sys_common/rwlock.rs similarity index 100% rename from src/libstd/sys/common/rwlock.rs rename to src/libstd/sys_common/rwlock.rs diff --git a/src/libstd/sys/common/thread.rs b/src/libstd/sys_common/thread.rs similarity index 100% rename from src/libstd/sys/common/thread.rs rename to src/libstd/sys_common/thread.rs diff --git a/src/libstd/sys/common/thread_info.rs b/src/libstd/sys_common/thread_info.rs similarity index 100% rename from src/libstd/sys/common/thread_info.rs rename to src/libstd/sys_common/thread_info.rs diff --git a/src/libstd/sys/common/thread_local.rs b/src/libstd/sys_common/thread_local.rs similarity index 100% rename from src/libstd/sys/common/thread_local.rs rename to src/libstd/sys_common/thread_local.rs diff --git a/src/libstd/sys/common/util.rs b/src/libstd/sys_common/util.rs similarity index 100% rename from src/libstd/sys/common/util.rs rename to src/libstd/sys_common/util.rs diff --git a/src/libstd/sys/common/wtf8.rs b/src/libstd/sys_common/wtf8.rs similarity index 100% rename from src/libstd/sys/common/wtf8.rs rename to src/libstd/sys_common/wtf8.rs diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs index 68b0c819c5a..72970bbe6e3 100644 --- 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