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.
rust-lang · Oct 4, 2016 · ae10558 · ae10558
1 parent 7b8cf2a
commit ae10558
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 4 deletions.
diff --git a/src/libstd/num/f32.rs → src/libstd/f32.rs b/src/libstd/num/f32.rs → src/libstd/f32.rs
diff --git a/src/libstd/num/f64.rs → src/libstd/f64.rs b/src/libstd/num/f64.rs → src/libstd/f64.rs
diff --git a/src/libstd/lib.rs b/src/libstd/lib.rs
@@ -422,8 +422,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 → src/libstd/num.rs b/src/libstd/num/mod.rs → src/libstd/num.rs
diff --git 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