Auto merge of #36030 - Manishearth:rollup, r=Manishearth

Rollup of 7 pull requests - Successful merges: #35124, #35877, #35953, #36002, #36004, #36005, #36014 - Failed merges:
rust-lang · Aug 27, 2016 · 099b9fd · 099b9fd
2 parents 6b74503 + 668d631
commit 099b9fd
Show file tree

Hide file tree

Showing 192 changed files with 1,479 additions and 3,849 deletions.
diff --git a/mk/docs.mk b/mk/docs.mk
@@ -66,7 +66,7 @@ ERR_IDX_GEN_MD = $(RPATH_VAR2_T_$(CFG_BUILD)_H_$(CFG_BUILD)) $(ERR_IDX_GEN_EXE)
 
 D := $(S)src/doc
 
-DOC_TARGETS := book nomicon style error-index
+DOC_TARGETS := book nomicon error-index
 COMPILER_DOC_TARGETS :=
 DOC_L10N_TARGETS :=
 
@@ -209,13 +209,6 @@ doc/nomicon/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/nomicon/*.md) |
 	$(Q)rm -rf doc/nomicon
 	$(Q)$(RUSTBOOK) build $(S)src/doc/nomicon doc/nomicon
 
-style: doc/style/index.html
-
-doc/style/index.html: $(RUSTBOOK_EXE) $(wildcard $(S)/src/doc/style/*.md) | doc/
-	@$(call E, rustbook: $@)
-	$(Q)rm -rf doc/style
-	$(Q)$(RUSTBOOK) build $(S)src/doc/style doc/style
-
 error-index: doc/error-index.html
 
 # Metadata used to generate the index is created as a side effect of

diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
@@ -308,10 +308,6 @@ impl Build {
                     doc::rustbook(self, stage, target.target, "nomicon",
                                   &doc_out);
                 }
-                DocStyle { stage } => {
-                    doc::rustbook(self, stage, target.target, "style",
-                                  &doc_out);
-                }
                 DocStandalone { stage } => {
                     doc::standalone(self, stage, target.target, &doc_out);
                 }

diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
@@ -92,7 +92,6 @@ macro_rules! targets {
             (doc, Doc { stage: u32 }),
             (doc_book, DocBook { stage: u32 }),
             (doc_nomicon, DocNomicon { stage: u32 }),
-            (doc_style, DocStyle { stage: u32 }),
             (doc_standalone, DocStandalone { stage: u32 }),
             (doc_std, DocStd { stage: u32 }),
             (doc_test, DocTest { stage: u32 }),
@@ -366,8 +365,7 @@ impl<'a> Step<'a> {
                 vec![self.libtest(compiler)]
             }
             Source::DocBook { stage } |
-            Source::DocNomicon { stage } |
-            Source::DocStyle { stage } => {
+            Source::DocNomicon { stage } => {
                 vec![self.target(&build.config.build).tool_rustbook(stage)]
             }
             Source::DocErrorIndex { stage } => {
@@ -382,8 +380,7 @@ impl<'a> Step<'a> {
             Source::Doc { stage } => {
                 let mut deps = vec![
                     self.doc_book(stage), self.doc_nomicon(stage),
-                    self.doc_style(stage), self.doc_standalone(stage),
-                    self.doc_std(stage),
+                    self.doc_standalone(stage), self.doc_std(stage),
                     self.doc_error_index(stage),
                 ];
 

diff --git a/src/doc/style/README.md b/src/doc/style/README.md
diff --git a/src/doc/style/SUMMARY.md b/src/doc/style/SUMMARY.md
diff --git a/src/doc/style/errors/README.md b/src/doc/style/errors/README.md
diff --git a/src/doc/style/errors/ergonomics.md b/src/doc/style/errors/ergonomics.md
diff --git a/src/doc/style/errors/handling.md b/src/doc/style/errors/handling.md
diff --git a/src/doc/style/errors/propagation.md b/src/doc/style/errors/propagation.md
diff --git a/src/doc/style/errors/signaling.md b/src/doc/style/errors/signaling.md