From 6135cbc9e2b9a7e62ae274cf57e9921f60f6ec73 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Sat, 1 Oct 2016 23:07:17 +0000
Subject: [PATCH] std: Flatten the num directory to reflect the module layout

This makes it dissimilar to how core is structured on disk, but
more predictable on its own.
---
 src/libstd/{num => }/f32.rs       | 0
 src/libstd/{num => }/f64.rs       | 0
 src/libstd/lib.rs                 | 4 ++--
 src/libstd/{num/mod.rs => num.rs} | 0
 src/tools/tidy/src/pal.rs         | 4 ++--
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/libstd/{num => }/f32.rs (100%)
 rename src/libstd/{num => }/f64.rs (100%)
 rename src/libstd/{num/mod.rs => num.rs} (100%)

diff --git a/src/libstd/num/f32.rs b/src/libstd/f32.rs
similarity index 100%
rename from src/libstd/num/f32.rs
rename to src/libstd/f32.rs
diff --git a/src/libstd/num/f64.rs b/src/libstd/f64.rs
similarity index 100%
rename from src/libstd/num/f64.rs
rename to src/libstd/f64.rs
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
index 6f9aa6d1e082e..8d973fc1ade47 100644
--- a/src/libstd/lib.rs
+++ b/src/libstd/lib.rs
@@ -423,8 +423,8 @@ pub use core_collections::vec;
 #[stable(feature = "rust1", since = "1.0.0")]
 pub use rustc_unicode::char;
 
-#[path = "num/f32.rs"]   pub mod f32;
-#[path = "num/f64.rs"]   pub mod f64;
+pub mod f32;
+pub mod f64;
 
 #[macro_use]
 pub mod thread;
diff --git a/src/libstd/num/mod.rs b/src/libstd/num.rs
similarity index 100%
rename from src/libstd/num/mod.rs
rename to src/libstd/num.rs
diff --git a/src/tools/tidy/src/pal.rs b/src/tools/tidy/src/pal.rs
index 72970bbe6e3c1..a5e4e5a4c2672 100644
--- a/src/tools/tidy/src/pal.rs
+++ b/src/tools/tidy/src/pal.rs
@@ -65,8 +65,8 @@ const EXCEPTION_PATHS: &'static [&'static str] = &[
     // temporary exceptions
     "src/libstd/rtdeps.rs", // Until rustbuild replaces make
     "src/libstd/path.rs",
-    "src/libstd/num/f32.rs",
-    "src/libstd/num/f64.rs",
+    "src/libstd/f32.rs",
+    "src/libstd/f64.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