Merge remote-tracking branch 'official/master' into issue260

Author: hashedone

.github/workflows/ci.yml

@@ -33,7 +33,17 @@ jobs:
         run: cargo test --all
 
       - name: Install mdbook
-        run: cd book && curl -L https://github.com/rust-lang/mdBook/releases/download/v0.3.5/mdbook-v0.3.5-x86_64-unknown-linux-gnu.tar.gz | tar xz
+        run: |
+          cd book
+          curl -L https://github.com/rust-lang/mdBook/releases/download/v0.3.7/mdbook-v0.3.7-x86_64-unknown-linux-gnu.tar.gz | tar xz
+          # Add the book directory to the $PATH
+          echo "::add-path::$GITHUB_WORKSPACE/book"
+
+      - name: Install mdbook-toc
+        run: cd book && curl -L https://github.com/badboy/mdbook-toc/releases/download/0.2.4/mdbook-toc-0.2.4-x86_64-unknown-linux-gnu.tar.gz | tar xz
+
+      - name: Install mdbook-mermaid
+        run: cd book && curl -L https://github.com/badboy/mdbook-mermaid/releases/download/0.2.2/mdbook-mermaid-0.2.2-x86_64-unknown-linux-gnu.tar.gz | tar xz
 
       - name: Execute tests for Chalk book
         run: cd book && ./mdbook test
@@ -48,7 +58,7 @@ jobs:
         run: |
           touch target/doc/.nojekyll
           curl -LsSf https://raw.githubusercontent.com/rust-lang/simpleinfra/master/setup-deploy-keys/src/deploy.rs | rustc - -o /tmp/deploy
-          cp -r book/book target/doc/book
+          cp -r book/book/html target/doc/book
           (cd target/doc && /tmp/deploy)
         env:
           GITHUB_DEPLOY_KEY: ${{ secrets.GITHUB_DEPLOY_KEY }}
@@ -72,3 +82,26 @@ jobs:
 
       - name: Check formatting of all crates in the workspace
         run: cargo fmt --all -- --check
+  
+  mdbook-linkcheck:
+    name: Book link check
+    runs-on: ubuntu-latest
+    if: github.ref != 'refs/heads/master'
+    steps:
+      - name: Checkout the source code
+        uses: actions/checkout@master
+        with:
+          fetch-depth: 1
+
+      - name: Install mdbook
+        run: |
+          cd book
+          curl -L https://github.com/rust-lang/mdBook/releases/download/v0.3.7/mdbook-v0.3.7-x86_64-unknown-linux-gnu.tar.gz | tar xz
+          # Add the book directory to the $PATH
+          echo "::add-path::$GITHUB_WORKSPACE/book"
+
+      - name: Install mdbook-linkcheck
+        run: cd book && curl -L https://github.com/Michael-F-Bryan/mdbook-linkcheck/releases/download/v0.5.0/mdbook-linkcheck-v0.5.0-x86_64-unknown-linux-gnu.tar.gz | tar xz
+
+      - name: Build Chalk book
+        run: cd book && ./mdbook build

.gitignore

@@ -9,3 +9,6 @@ TAGS
 *~
 target
 chalk-parse/src/parser.rs
+
+## IDE files
+/.idea/

CONTRIBUTING.md

@@ -92,4 +92,4 @@ of the terminology used in chalk.
 ### Trait solving in rustc-dev-guide
 The rustc-dev-guide describes [new-style trait solving][trait-solving], which is slowly replacing the old trait resolution.
 
-[trait-solving]: https://rustc-dev-guide.rust-lang.org/traits/index.html
+[trait-solving]: https://rustc-dev-guide.rust-lang.org/traits/chalk.html