Skip to content

Commit

Permalink
Rollup merge of rust-lang#35124 - steveklabnik:remove_style, r=aturon
Browse files Browse the repository at this point in the history
Remove style guide.

We originally imported this into the repository with the intent of
fixing it up. Instead, nothing happened.

Its appearance on rust-lang.org makes it seem semi-official, but it's
not. The rustfmt strike team will end up producing something like this
anyway, and leaving it around does nothing but mislead people.

r? @aturon
  • Loading branch information
steveklabnik committed Aug 26, 2016
2 parents eaf71f8 + 57719e2 commit fdf00dc
Show file tree
Hide file tree
Showing 54 changed files with 1 addition and 2,526 deletions.
9 changes: 1 addition & 8 deletions mk/docs.mk
Original file line number Diff line number Diff line change
Expand Up @@ -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 :=

Expand Down Expand Up @@ -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
Expand Down
64 changes: 0 additions & 64 deletions src/doc/style/README.md

This file was deleted.

50 changes: 0 additions & 50 deletions src/doc/style/SUMMARY.md

This file was deleted.

3 changes: 0 additions & 3 deletions src/doc/style/errors/README.md

This file was deleted.

66 changes: 0 additions & 66 deletions src/doc/style/errors/ergonomics.md

This file was deleted.

7 changes: 0 additions & 7 deletions src/doc/style/errors/handling.md

This file was deleted.

8 changes: 0 additions & 8 deletions src/doc/style/errors/propagation.md

This file was deleted.

125 changes: 0 additions & 125 deletions src/doc/style/errors/signaling.md

This file was deleted.

9 changes: 0 additions & 9 deletions src/doc/style/features/README.md

This file was deleted.

6 changes: 0 additions & 6 deletions src/doc/style/features/crates.md

This file was deleted.

Loading

0 comments on commit fdf00dc

Please sign in to comment.