simplify and improve doc generation with xtask

also scrapes examples and removes pre-content

Author: Emilgardis

.github/workflows/ci.yml

@@ -46,19 +46,7 @@ jobs:
         with:
           toolchain: ${{ matrix.rust }}
           override: true
-      - name: Ready cache
-        if: matrix.os == 'ubuntu-latest'
-        run: sudo chown -R $(whoami):$(id -ng) ~/.cargo/
-      - name: Cache cargo
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: |
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       - name: Test twitch_oauth2
         uses: actions-rs/cargo@v1
         with:
@@ -91,16 +79,7 @@ jobs:
           toolchain: nightly
           override: true
           components: clippy
-      - name: Cache cargo
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: |
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       - name: Run clippy
         uses: actions-rs/cargo@v1
         with:
@@ -121,16 +100,7 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-      - name: Cache cargo
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path: |
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+      - uses: Swatinem/rust-cache@v2
       # We do the following to make sure docs.rs can document properly without anything broken, and that docs are working.
       - name: Run doc tests
         uses: actions-rs/cargo@v1

.github/workflows/gh-pages.yml

@@ -1,8 +1,6 @@
 name: github pages
 env:
   CI_TWITCH_OAUTH2_FEATURES: "all mock_api"
-  RUSTDOCFLAGS: "-Z unstable-options --html-in-header=docs/pre-content.html --cfg nightly"
-  RUSTFLAGS: "--cfg nightly"
 on:
   push:
     branches:
@@ -17,29 +15,13 @@ jobs:
           profile: minimal
           toolchain: nightly
           override: true
-      - name: Cache cargo
-        uses: actions/cache@v1
-        id: cache
-        with:
-          path:
-            ~/.cargo/registry/index
-            ~/.cargo/registry/cache
-            ~/.cargo/git
-            target
-          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-      - name: mention 40 character commit rev in doc
-        run: sed -i "s/{{commit}}/$(git rev-parse HEAD)/g" docs/pre-content.html
-      - name: mention short commit rev in doc
-        run: sed -i "s/{{commit_short}}/$(git rev-parse --short HEAD)/g" docs/pre-content.html
+      - uses: Swatinem/rust-cache@v2
       - name: build twitch_oauth2 docs
-        uses: actions-rs/cargo@v1
-        with:
-          command: doc
-          args: --no-deps --features "${{ env.CI_TWITCH_OAUTH2_FEATURES }}"
+        run: cargo xtask doc
       - name: move index.html
-        run: cp ./docs/index.html ./target/doc/index.html
+        run: cp ./docs/index.html ./target/extra/doc/index.html
       - name: Deploy
         uses: peaceiris/actions-gh-pages@v3
         with:
           github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: ./target/doc
+          publish_dir: ./target/extra/doc