---

yaml
---
r: 145366
b: refs/heads/try2
c: eb55348
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 90e1e8fc4078c05b22b6a4d2716f50db6ec860f7
+refs/heads/try2: eb55348a7cb1d99563c9135b8c83bcc20f6346bf
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/doc/tutorial.md

@@ -2420,7 +2420,8 @@ However, in practice you usually want to split you code up into multiple source
 In order to do that, Rust allows you to move the body of any module into it's own source file, which works like this:
 
 If you declare a module without its body, like `mod foo;`, the compiler will look for the
-files `foo.rs` and `foo/mod.rs`. If it finds either, it uses the content of that file as the body of the module.
+files `foo.rs` and `foo/mod.rs` inside some directory (usually the same as of the source file containing
+the `mod foo;`). If it finds either, it uses the content of that file as the body of the module.
 If it finds both, that's a compile error.
 
 So, if we want to move the content of `mod farm` into it's own file, it would look like this:
@@ -2446,7 +2447,7 @@ pub mod barn {
 # fn main() { }
 ~~~~
 
-So, in short `mod foo;` is just syntactic sugar for `mod foo { /* include content of foo.rs or foo/mod.rs here */ }`.
+In short, `mod foo;` is just syntactic sugar for `mod foo { /* content of <...>/foo.rs or <...>/foo/mod.rs */ }`.
 
 This also means that having two or more identical `mod foo;` somewhere
 in your crate hierarchy is generally a bad idea,
@@ -2455,14 +2456,14 @@ Both will result in duplicate and mutually incompatible definitions.
 
 The directory the compiler looks in for those two files is determined by starting with
 the same directory as the source file that contains the `mod foo;` declaration, and concatenating to that a
-path equivalent to the relative path of all nested `mod { ... }` declarations the `mod foo;` is contained in, if any.
+path equivalent to the relative path of all nested `mod { ... }` declarations the `mod foo;`
+is contained in, if any.
 
 For example, given a file with this module body:
 
 ~~~ {.ignore}
 // src/main.rs
 mod plants;
-mod fungi;
 mod animals {
     mod fish;
     mod mammals {
@@ -2477,25 +2478,61 @@ The compiler would then try all these files:
 src/plants.rs
 src/plants/mod.rs
 
-src/fungi.rs
-src/fungi/mod.rs
-
 src/animals/fish.rs
 src/animals/fish/mod.rs
 
 src/animals/mammals/humans.rs
 src/animals/mammals/humans/mod.rs
 ~~~
 
-These rules per default result in any directory structure mirroring
-the crates's module hierarchy, and allow you to have both small modules that only need
-to consist of one source file, and big modules that group the source files of submodules together.
+Keep in mind that identical module hierachies can still lead to different path lookups
+depending on how and where you've moved a module body to its own file.
+For example, if we move the `animals` module above into its own file...
+
+~~~ {.ignore}
+// src/main.rs
+mod plants;
+mod animals;
+~~~
+~~~ {.ignore}
+// src/animals.rs or src/animals/mod.rs
+mod fish;
+mod mammals {
+    mod humans;
+}
+~~~
+...then the source files of `mod animals`'s submodules can
+either be placed right next to that of its parents, or in a subdirectory if `animals` source file is:
+
+~~~ {.notrust}
+src/plants.rs
+src/plants/mod.rs
+
+src/animals.rs - if file sits next to that of parent module's:
+    src/fish.rs
+    src/fish/mod.rs
+
+    src/mammals/humans.rs
+    src/mammals/humans/mod.rs
+
+src/animals/mod.rs - if file is in it's own subdirectory:
+    src/animals/fish.rs
+    src/animals/fish/mod.rs
+
+    src/animals/mammals/humans.rs
+    src/animals/mammals/humans/mod.rs
+
+~~~
+
+These rules allow you to have both small modules that only need
+to consist of one source file each and can be conveniently placed right next to each other,
+and big complicated modules that group the source files of submodules in subdirectories.
 
-If you need to circumvent those defaults, you can also overwrite the path a `mod foo;` would take:
+If you need to circumvent the defaults, you can also overwrite the path a `mod foo;` would take:
 
 ~~~ {.ignore}
-#[path="../../area51/classified.rs"]
-mod alien;
+#[path="../../area51/alien.rs"]
+mod classified;
 ~~~
 
 ## Importing names into the local scope

branches/try2/mk/tools.mk

@@ -21,7 +21,8 @@ RUSTPKG_INPUTS := $(wildcard $(S)src/librustpkg/*.rs)
 
 # Rustdoc, the documentation tool
 RUSTDOC_LIB := $(S)src/librustdoc/rustdoc.rs
-RUSTDOC_INPUTS := $(wildcard $(S)src/librustdoc/*.rs)
+RUSTDOC_INPUTS := $(wildcard $(addprefix $(S)src/librustdoc/,        \
+                                           *.rs */*.rs */*/*.rs))
 
 # Rusti, the JIT REPL
 RUSTI_LIB := $(S)src/librusti/rusti.rs

branches/try2/src/librustdoc/html/layout.rs

@@ -36,7 +36,7 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
 
     <link href='http://fonts.googleapis.com/css?family=Oswald:700|Inconsolata:400'
           rel='stylesheet' type='text/css'>
-    <link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}main.css\">
+    <link rel=\"stylesheet\" type=\"text/css\" href=\"{root_path}{crate}/main.css\">
 
     {favicon, select, none{} other{
         <link rel=\"icon\" href=\"#\" sizes=\"16x16\"
@@ -52,7 +52,7 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
 
     <section class=\"sidebar\">
         {logo, select, none{} other{
-            <a href='{root_path}index.html'><img src='#' alt=''/></a>
+            <a href='{root_path}{crate}/index.html'><img src='#' alt=''/></a>
         }}
 
         {sidebar}
@@ -73,9 +73,9 @@ pub fn render<T: fmt::Default, S: fmt::Default>(
     <script>
         var rootPath = \"{root_path}\";
     </script>
-    <script src=\"{root_path}jquery.js\"></script>
+    <script src=\"{root_path}{crate}/jquery.js\"></script>
     <script src=\"{root_path}{crate}/search-index.js\"></script>
-    <script src=\"{root_path}main.js\"></script>
+    <script src=\"{root_path}{crate}/main.js\"></script>
 
     <div id=\"help\" class=\"hidden\">
         <div class=\"shortcuts\">

branches/try2/src/librustdoc/html/render.rs

@@ -128,20 +128,15 @@ pub fn run(mut crate: clean::Crate, dst: Path) {
     crate = cache.fold_crate(crate);
 
     // Add all the static files
-    write(cx.dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js"));
-    write(cx.dst.push("main.js"), include_str!("static/main.js"));
-    write(cx.dst.push("main.css"), include_str!("static/main.css"));
-    write(cx.dst.push("normalize.css"), include_str!("static/normalize.css"));
-    write(cx.dst.push("index.html"), format!("
-        <DOCTYPE html><html><head>
-            <meta http-equiv='refresh'
-                  content=\"0; url={}/index.html\">
-        </head><body></body></html>
-    ", crate.name));
+    let dst = cx.dst.push(crate.name);
+    mkdir(&dst);
+    write(dst.push("jquery.js"), include_str!("static/jquery-2.0.3.min.js"));
+    write(dst.push("main.js"), include_str!("static/main.js"));
+    write(dst.push("main.css"), include_str!("static/main.css"));
+    write(dst.push("normalize.css"), include_str!("static/normalize.css"));
 
     {
-        mkdir(&cx.dst.push(crate.name));
-        let dst = cx.dst.push(crate.name).push("search-index.js");
+        let dst = dst.push("search-index.js");
         let mut w = BufferedWriter::new(dst.open_writer(io::CreateOrTruncate));
         let w = &mut w as &mut io::Writer;
         write!(w, "var searchIndex = [");