about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2013-11-03 05:01:02 -0800
committerbors <bors@rust-lang.org>2013-11-03 05:01:02 -0800
commitdc079e1596bb5fd7b601fe1b605c8f30326ee748 (patch)
tree1cff913f7020f89a9441a0eb19d9e573329bba92 /src/libstd
parent318e1da4a79533cf8040ef41dc1b1a2ef861906b (diff)
parent0369a41f0e668eda5622055253b91dbb5254f0b4 (diff)
downloadrust-dc079e1596bb5fd7b601fe1b605c8f30326ee748.tar.gz
rust-dc079e1596bb5fd7b601fe1b605c8f30326ee748.zip
auto merge of #10143 : chris-morgan/rust/filename-consistency, r=huonw
New standards have arisen in recent months, mostly for the use of
rustpkg, but the main Rust codebase has not been altered to match these
new specifications. This changeset rectifies most of these issues.

- Renamed the crate source files `src/libX/X.rs` to `lib.rs`, for
  consistency with current styles; this affects extra, rustc, rustdoc,
  rustpkg, std, syntax.

- Renamed `X/X.rs` to `X/mod.rs,` as is now recommended style, for
  `std::num` and `std::terminfo`.

- Shifted `src/libstd/str/ascii.rs` out of the otherwise unused `str`
  directory, to be consistent with its import path of `std::ascii`;
  libstd is flat at present so it's more appropriate thus.

While this removes some `#[path = "..."]` directives, it does not remove
all of them, and leaves certain other inconsistencies, such as `std::u8`
et al. which are actually stored in `src/libstd/num/` (one subdirectory
down). No quorum has been reached on this issue, so I felt it best to
leave them all alone at present. #9208 deals with the possibility of
making libstd more hierarchical (such as changing the crate to match the
current filesystem structure, which would make the module path
`std::num::u8`).

There is one thing remaining in which this repository is not
rustpkg-compliant: rustpkg would have `src/std/` et al. rather than
`src/libstd/` et al. I have not endeavoured to change that at this point
as it would guarantee prompt bitrot and confusion. A change of that
magnitude needs to be discussed first.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/ascii.rs (renamed from src/libstd/str/ascii.rs)0
-rw-r--r--src/libstd/lib.rs (renamed from src/libstd/std.rs)2
-rw-r--r--src/libstd/num/mod.rs (renamed from src/libstd/num/num.rs)0
3 files changed, 0 insertions, 2 deletions
diff --git a/src/libstd/str/ascii.rs b/src/libstd/ascii.rs
index ec2d7566177..ec2d7566177 100644
--- a/src/libstd/str/ascii.rs
+++ b/src/libstd/ascii.rs
diff --git a/src/libstd/std.rs b/src/libstd/lib.rs
index 4500bae4c90..68f13dc8992 100644
--- a/src/libstd/std.rs
+++ b/src/libstd/lib.rs
@@ -122,7 +122,6 @@ pub mod vec;
 pub mod at_vec;
 pub mod str;
 
-#[path = "str/ascii.rs"]
 pub mod ascii;
 pub mod send_str;
 
@@ -143,7 +142,6 @@ pub mod rc;
 /* Common traits */
 
 pub mod from_str;
-#[path = "num/num.rs"]
 pub mod num;
 pub mod iter;
 pub mod to_str;
diff --git a/src/libstd/num/num.rs b/src/libstd/num/mod.rs
index 3097a8e138e..3097a8e138e 100644
--- a/src/libstd/num/num.rs
+++ b/src/libstd/num/mod.rs