---

yaml
---
r: 273011
b: refs/heads/beta
c: 16fefc5
h: refs/heads/master
i:
  273009: dcb40af
  273007: d01145c

Author: alexcrichton

[refs]

@@ -23,7 +23,7 @@ refs/tags/0.9: 36870b185fc5f5486636d4515f0e22677493f225
 refs/tags/0.10: ac33f2b15782272ae348dbd7b14b8257b2148b5a
 refs/tags/0.11.0: e1247cb1d0d681be034adb4b558b5a0c0d5720f9
 refs/tags/0.12.0: f0c419429ef30723ceaf6b42f9b5a2aeb5d2e2d1
-refs/heads/beta: defd1b3392df2434ae67e0885cba16cdb9a2d5b4
+refs/heads/beta: 16fefc5ead7d3338acf80f225f0f256a286345c5
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
 refs/heads/tmp: e06d2ad9fcd5027bcaac5b08fc9aa39a49d0ecd3
 refs/tags/1.0.0-alpha.2: 4c705f6bc559886632d3871b04f58aab093bfa2f

branches/beta/src/bootstrap/build/compile.rs

@@ -141,15 +141,10 @@ pub fn rustc<'a>(build: &'a Build, stage: u32, target: &str,
 
     let mut cargo = build.cargo(stage, compiler, Mode::Librustc, Some(target),
                                 "build");
-    cargo.arg("--features").arg(build.rustc_features(stage))
+    cargo.arg("--features").arg(build.rustc_features())
          .arg("--manifest-path")
          .arg(build.src.join("src/rustc/Cargo.toml"));
 
-    // In stage0 we may not need to build as many executables
-    if stage == 0 {
-        cargo.arg("--bin").arg("rustc");
-    }
-
     // Set some configuration variables picked up by build scripts and
     // the compiler alike
     cargo.env("CFG_RELEASE", &build.release)

branches/beta/src/bootstrap/build/doc.rs

@@ -135,7 +135,7 @@ pub fn rustc(build: &Build, stage: u32, host: &str, out: &Path) {
                                 "doc");
     cargo.arg("--manifest-path")
          .arg(build.src.join("src/rustc/Cargo.toml"))
-         .arg("--features").arg(build.rustc_features(stage));
+         .arg("--features").arg(build.rustc_features());
     build.run(&mut cargo);
     cp_r(&out_dir, out)
 }

branches/beta/src/bootstrap/build/mod.rs

@@ -379,14 +379,11 @@ impl Build {
     }
 
     /// Get the space-separated set of activated features for the compiler.
-    fn rustc_features(&self, stage: u32) -> String {
+    fn rustc_features(&self) -> String {
         let mut features = String::new();
         if self.config.use_jemalloc {
             features.push_str(" jemalloc");
         }
-        if stage > 0 {
-            features.push_str(" rustdoc");
-        }
         return features
     }
 

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

@@ -1454,7 +1454,7 @@ impl<'a> Item<'a> {
         // has anchors for the line numbers that we're linking to.
         } else if self.item.def_id.is_local() {
             self.cx.local_sources.get(&PathBuf::from(&self.item.source.filename)).map(|path| {
-                format!("{root}src/{krate}/{path}.html#{href}",
+                format!("{root}src/{krate}/{path}#{href}",
                         root = self.cx.root_path,
                         krate = self.cx.layout.krate,
                         path = path,

branches/beta/src/rustc/Cargo.toml

@@ -25,7 +25,7 @@ debug-assertions = false
 [dependencies]
 rustc_back = { path = "../librustc_back" }
 rustc_driver = { path = "../librustc_driver" }
-rustdoc = { path = "../librustdoc", optional = true }
+rustdoc = { path = "../librustdoc" }
 
 [features]
 jemalloc = ["rustc_back/jemalloc"]