chore(cargo): Bump version (v0.27.0)

Merge pull request #516 from vbrandl/dependabot/cargo/tokio-1.22.0
chore(deps): Bump tokio from 1.21.2 to 1.22.0
2022-11-21 10:52:30 +01:00 · 2022-11-21 10:47:58 +01:00 · 2022-11-21 10:40:08 +01:00 · 2022-11-21 09:04:51 +00:00 · 2022-11-21 10:03:23 +01:00 · 2022-11-21 09:59:59 +01:00
19 changed files with 360 additions and 228 deletions
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@ -1,6 +1,6 @@
 version: 2
 updates:
- package-ecosystem: cargo
+  - package-ecosystem: cargo
    directory: "/"
    schedule:
      interval: daily
@ -8,3 +8,5 @@ updates:
    open-pull-requests-limit: 10
    assignees:
      - vbrandl
+    labels:
+      - dependencies
--- a/.github/workflows/audit.yml
+++ b/.github/workflows/audit.yml
@ -3,26 +3,19 @@ on:
  schedule:
    - cron: '0 1 * * *'
  push:
+    branches:
+      - master
+  pull_request:
    paths:
      - '**/Cargo.toml'
      - '**/Cargo.lock'
-  pull_request:
+      - ".cargo/audit.toml"

 jobs:
  security_audit:
    runs-on: ubuntu-latest
    steps:
-      - uses: actions/checkout@v2
-
-      - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: audit-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
+      - uses: actions/checkout@v3
      - uses: actions-rs/audit-check@v1
        with:
          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@ -6,8 +6,12 @@ on:
      - 'v[0-9]+.[0-9]+.[0-9]+'

 jobs:
+  tests:
+    uses: vbrandl/hoc/.github/workflows/rust.yml@master
+
  publish:
    name: Publishing for ${{ matrix.os }}
+    needs: [tests]
    runs-on: ${{ matrix.os }}
    strategy:
      matrix:
@ -29,7 +33,7 @@ jobs:

    steps:
      - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Install stable toolchain
        uses: actions-rs/toolchain@v1
@ -44,7 +48,7 @@ jobs:
            ~/.cargo/registry
            ~/.cargo/git
            ./target
-          key: release-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

      - name: Cargo build
        uses: actions-rs/cargo@v1
@ -74,3 +78,14 @@ jobs:
            target/${{ matrix.target }}/release/hoc-${{ matrix.artifact_prefix }}.sha256
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  changelog:
+    name: Update Changelog
+    needs: [tests]
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - uses: taiki-e/create-gh-release-action@v1
+        with:
+          changelog: CHANGELOG.md
+          token: ${{ secrets.GITHUB_TOKEN }}
--- a/.github/workflows/rust.yml
+++ b/.github/workflows/rust.yml
@ -1,13 +1,19 @@
-on: [push, pull_request]
+on:
+  workflow_call:
+  push:
+    branches:
+      - master
+  pull_request:
+  schedule:
+    - cron: "0 0 * * *"

 jobs:
-
  rustfmt:
    name: Rustfmt
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Install stable toolchain
        uses: actions-rs/toolchain@v1
@ -17,15 +23,6 @@ jobs:
          override: true
          components: rustfmt

-      - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
-        with:
-          path: |
-            ~/.cargo/registry
-            ~/.cargo/git
-            ./target
-          key: rustfmt-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
-
      - name: Check Formatting
        uses: actions-rs/cargo@v1
        with:
@ -37,7 +34,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Install stable toolchain
        uses: actions-rs/toolchain@v1
@ -48,13 +45,13 @@ jobs:
          components: rustfmt

      - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: |
            ~/.cargo/registry
            ~/.cargo/git
            ./target
-          key: clippy-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

      - name: Clippy Linting
        uses: actions-rs/cargo@v1
@ -74,7 +71,7 @@ jobs:

    steps:
      - name: Checkout sources
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3

      - name: Install stable toolchain
        uses: actions-rs/toolchain@v1
@ -84,13 +81,13 @@ jobs:
          override: true

      - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
        with:
          path: |
            ~/.cargo/registry
            ~/.cargo/git
            ./target
-          key: test-${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
+          key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}

      - name: Run Tests
        uses: actions-rs/cargo@v1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -0,0 +1,50 @@
+# Changelog
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [Unreleased]
+
+
+## [0.27.0] 2022-10-21
+
+### Dependency Updates
+
+* Updated [`futures`](https://github.com/rust-lang/futures-rs) from 0.3.24 to 0.3.25 ([#511])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.86 to 1.0.87 ([#510])
+* Updated [`serde`](https://github.com/serde-rs/serde) from 1.0.145 to 1.0.147 ([#512])
+* Updated [`tracing-actix-web`](https://github.com/LukeMathWalker/tracing-actix-web) from 0.6.1 to 0.6.2 ([#513])
+* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.12 to 0.11.13 ([#515])
+* Bumps [`tokio`](https://github.com/tokio-rs/tokio) from 1.21.2 to 1.22.0 ([#516])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.87 to 1.0.88 ([#517])
+
+
+### Fixes
+
+* Fix clippy lint `needless-borrow` ([#514])
+
+[#511]: https://github.com/vbrandl/hoc/pull/511
+[#510]: https://github.com/vbrandl/hoc/pull/510
+[#512]: https://github.com/vbrandl/hoc/pull/512
+[#513]: https://github.com/vbrandl/hoc/pull/513
+[#514]: https://github.com/vbrandl/hoc/pull/514
+[#515]: https://github.com/vbrandl/hoc/pull/515
+[#516]: https://github.com/vbrandl/hoc/pull/516
+[#517]: https://github.com/vbrandl/hoc/pull/517
+
+
+## [0.26.0] 2022-10-03
+
+### Changed
+
+* Updated [`tracing-subscriber`](https://github.com/tokio-rs/tracing) from 0.3.15 to 0.3.16 ([#501])
+* Updated [`tracing`](https://github.com/tokio-rs/tracing) from 0.1.36 to 0.1.37 ([#502])
+* Updated [`serde_json`](https://github.com/serde-rs/json) from 1.0.85 to 1.0.86 ([#503])
+* Updated [`tracing-bunyan-formatter`](https://github.com/LukeMathWalker/tracing-bunyan-formatter) from 0.3.3 to 0.3.4 ([#504])
+* Updated [`dotenvy`](https://github.com/allan2/dotenvy) from 0.15.5 to 0.15.6 ([#508])
+
+[#501]: https://github.com/vbrandl/hoc/pull/501
+[#502]: https://github.com/vbrandl/hoc/pull/502
+[#503]: https://github.com/vbrandl/hoc/pull/503
+[#504]: https://github.com/vbrandl/hoc/pull/504
+[#508]: https://github.com/vbrandl/hoc/pull/508
--- a/Cargo.lock
+++ b/Cargo.lock
@ -2,6 +2,16 @@
 # It is not intended for manual editing.
 version = 3

+[[package]]
+name = "ab_glyph"
+version = "0.2.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04a9283dace1c41c265496614998d5b9c4a97b3eb770e804f007c5144bf03f2b"
+dependencies = [
+ "ab_glyph_rasterizer",
+ "owned_ttf_parser",
+]
+
 [[package]]
 name = "ab_glyph_rasterizer"
 version = "0.1.5"
@ -27,16 +37,16 @@ dependencies = [

 [[package]]
 name = "actix-http"
-version = "3.1.0"
+version = "3.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd2e9f6794b5826aff6df65e3a0d0127b271d1c03629c774238f3582e903d4e4"
+checksum = "0c83abf9903e1f0ad9973cc4f7b9767fd5a03a583f51a5b7a339e07987cd2724"
 dependencies = [
 "actix-codec",
 "actix-rt",
 "actix-service",
 "actix-utils",
 "ahash",
- "base64 0.13.0",
+ "base64",
 "bitflags",
 "brotli",
 "bytes",
@ -155,9 +165,9 @@ dependencies = [

 [[package]]
 name = "actix-web"
-version = "4.1.0"
+version = "4.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a27e8fe9ba4ae613c21f677c2cfaf0696c3744030c6f485b34634e502d6bb379"
+checksum = "d48f7b6534e06c7bfc72ee91db7917d4af6afe23e7d223b51e68fffbb21e96b9"
 dependencies = [
 "actix-codec",
 "actix-http",
@ -177,6 +187,7 @@ dependencies = [
 "encoding_rs",
 "futures-core",
 "futures-util",
+ "http",
 "itoa",
 "language-tags",
 "log",
@ -195,9 +206,9 @@ dependencies = [

 [[package]]
 name = "actix-web-codegen"
-version = "4.0.1"
+version = "4.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f270541caec49c15673b0af0e9a00143421ad4f118d2df7edcb68b627632f56"
+checksum = "1fa9362663c8643d67b2d5eafba49e4cb2c8a053a29ed00a0bea121f17c76b13"
 dependencies = [
 "actix-router",
 "proc-macro2",
@ -246,15 +257,6 @@ dependencies = [
 "alloc-no-stdlib",
 ]

-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anyhow"
 version = "1.0.57"
@ -280,9 +282,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "awc"
-version = "3.0.0"
+version = "3.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65c60c44fbf3c8cee365e86b97d706e513b733c4eeb16437b45b88d2fffe889a"
+checksum = "80ca7ff88063086d2e2c70b9f3b29b2fcd999bac68ac21731e66781970d68519"
 dependencies = [
 "actix-codec",
 "actix-http",
@ -291,7 +293,7 @@ dependencies = [
 "actix-tls",
 "actix-utils",
 "ahash",
- "base64 0.13.0",
+ "base64",
 "bytes",
 "cfg-if",
 "cookie",
@ -313,22 +315,16 @@ dependencies = [
 ]

 [[package]]
-name = "badge"
-version = "0.3.0"
+name = "badgers"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0228ae65b89e72921e86c19c3574da63bda0628e9d7da5e164f569bbf4e477d"
+checksum = "26315f90cbcd241425a27dcc1140dbc85505e87ddc90f324067df6a158572fb3"
 dependencies = [
- "base64 0.12.3",
+ "ab_glyph",
+ "base64",
 "once_cell",
- "rusttype",
 ]

-[[package]]
-name = "base64"
-version = "0.12.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3441f0f7b02788e948e47f457ca01f1d7e6d92c693bc132c22b087d3141c03ff"
-
 [[package]]
 name = "base64"
 version = "0.13.0"
@ -565,10 +561,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0688c2a7f92e427f44895cd63841bff7b29f8d7a1648b9e7e07a4a365b2e1257"

 [[package]]
-name = "dotenv"
-version = "0.15.0"
+name = "dotenvy"
+version = "0.15.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77c90badedccf4105eca100756a0b1289e191f6fcbdadd3cee1d2f614f97da8f"
+checksum = "03d8c417d7a8cb362e0c37e5d815f5eb7c37f79ff93707329d5a194e42e54ca0"

 [[package]]
 name = "either"
@ -669,9 +665,9 @@ dependencies = [

 [[package]]
 name = "futures"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73fe65f54d1e12b726f517d3e2135ca3125a437b6d998caf1962961f7172d9e"
+checksum = "38390104763dc37a5145a53c29c63c1290b5d316d6086ec32c293f6736051bb0"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -684,9 +680,9 @@ dependencies = [

 [[package]]
 name = "futures-channel"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c3083ce4b914124575708913bca19bfe887522d6e2e6d0952943f5eac4a74010"
+checksum = "52ba265a92256105f45b719605a571ffe2d1f0fea3807304b522c1d778f79eed"
 dependencies = [
 "futures-core",
 "futures-sink",
@ -694,15 +690,15 @@ dependencies = [

 [[package]]
 name = "futures-core"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c09fd04b7e4073ac7156a9539b57a484a8ea920f79c7c675d05d289ab6110d3"
+checksum = "04909a7a7e4633ae6c4a9ab280aeb86da1236243a77b694a49eacd659a4bd3ac"

 [[package]]
 name = "futures-executor"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9420b90cfa29e327d0429f19be13e7ddb68fa1cccb09d65e5706b8c7a749b8a6"
+checksum = "7acc85df6714c176ab5edf386123fafe217be88c0840ec11f199441134a074e2"
 dependencies = [
 "futures-core",
 "futures-task",
@ -711,15 +707,15 @@ dependencies = [

 [[package]]
 name = "futures-io"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc4045962a5a5e935ee2fdedaa4e08284547402885ab326734432bed5d12966b"
+checksum = "00f5fb52a06bdcadeb54e8d3671f8888a39697dcb0b81b23b55174030427f4eb"

 [[package]]
 name = "futures-macro"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33c1e13800337f4d4d7a316bf45a567dbcb6ffe087f16424852d97e97a91f512"
+checksum = "bdfb8ce053d86b91919aad980c220b1fb8401a9394410e1c289ed7e66b61835d"
 dependencies = [
 "proc-macro2",
 "quote",
@ -728,21 +724,21 @@ dependencies = [

 [[package]]
 name = "futures-sink"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21163e139fa306126e6eedaf49ecdb4588f939600f0b1e770f4205ee4b7fa868"
+checksum = "39c15cf1a4aa79df40f1bb462fb39676d0ad9e366c2a33b590d7c66f4f81fcf9"

 [[package]]
 name = "futures-task"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57c66a976bf5909d801bbef33416c41372779507e7a6b3a5e25e4749c58f776a"
+checksum = "2ffb393ac5d9a6eaa9d3fdf37ae2776656b706e200c8e16b1bdb227f5198e6ea"

 [[package]]
 name = "futures-util"
-version = "0.3.21"
+version = "0.3.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b7abd5d659d9b90c8cba917f6ec750a74e2dc23902ef9cd4cc8c8b22e6036a"
+checksum = "197676987abd2f9cadff84926f410af1c183608d36641465df73ae8211dc65d6"
 dependencies = [
 "futures-channel",
 "futures-core",
@ -868,15 +864,15 @@ dependencies = [

 [[package]]
 name = "hoc"
-version = "0.22.4"
+version = "0.27.0"
 dependencies = [
 "actix-rt",
 "actix-web",
 "awc",
- "badge",
+ "badgers",
 "bytes",
 "config",
- "dotenv",
+ "dotenvy",
 "futures",
 "git2",
 "lazy_static",
@ -1207,9 +1203,9 @@ dependencies = [

 [[package]]
 name = "mio"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "713d550d9b44d89174e066b7a6217ae06234c10cb47819a88290d2b353c31799"
+checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
 dependencies = [
 "libc",
 "log",
@ -1245,6 +1241,16 @@ dependencies = [
 "minimal-lexical",
 ]

+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num_cpus"
 version = "1.13.1"
@ -1338,10 +1344,16 @@ dependencies = [
 ]

 [[package]]
-name = "owned_ttf_parser"
-version = "0.6.0"
+name = "overload"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f923fb806c46266c02ab4a5b239735c144bdeda724a50ed058e5226f594cde3"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "owned_ttf_parser"
+version = "0.15.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05e6affeb1632d6ff6a23d2cd40ffed138e82f1532571a26f527c8a284bb2fbb"
 dependencies = [
 "ttf-parser",
 ]
@ -1500,9 +1512,9 @@ dependencies = [

 [[package]]
 name = "proc-macro2"
-version = "1.0.39"
+version = "1.0.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c54b25569025b7fc9651de43004ae593a75ad88543b17178aa5e1b9c4f15f56f"
+checksum = "94e2ef8dbfc347b10c094890f778ee2e36ca9bb4262e86dc99cd217e35f3470b"
 dependencies = [
 "unicode-ident",
 ]
@ -1592,11 +1604,11 @@ dependencies = [

 [[package]]
 name = "reqwest"
-version = "0.11.11"
+version = "0.11.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b75aa69a3f06bbcc66ede33af2af253c6f7a86b1ca0033f60c580a27074fbf92"
+checksum = "68cc60575865c7831548863cc02356512e3f1dc2f3f82cb837d7fc4cc8f3c97c"
 dependencies = [
- "base64 0.13.0",
+ "base64",
 "bytes",
 "encoding_rs",
 "futures-core",
@ -1608,10 +1620,10 @@ dependencies = [
 "hyper-tls",
 "ipnet",
 "js-sys",
- "lazy_static",
 "log",
 "mime",
 "native-tls",
+ "once_cell",
 "percent-encoding",
 "pin-project-lite",
 "serde",
@ -1633,18 +1645,18 @@ version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "88073939a61e5b7680558e6be56b419e208420c2adb92be54921fa6b72283f1a"
 dependencies = [
- "base64 0.13.0",
+ "base64",
 "bitflags",
 "serde",
 ]

 [[package]]
 name = "ructe"
-version = "0.14.0"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef88d8c2492d7266e264b31e0ffcf1149d5ba183bccd3abaf1483ee905fc85de"
+checksum = "85517cd381cf0c34694881d8aaf173107c6af7670e66cec18d7a1a8bfce3b758"
 dependencies = [
- "base64 0.13.0",
+ "base64",
 "bytecount",
 "itertools",
 "md5",
@ -1671,16 +1683,6 @@ dependencies = [
 "semver",
 ]

-[[package]]
-name = "rusttype"
-version = "0.9.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dc7c727aded0be18c5b80c1640eae0ac8e396abf6fa8477d96cb37d18ee5ec59"
-dependencies = [
- "ab_glyph_rasterizer",
- "owned_ttf_parser",
-]
-
 [[package]]
 name = "rustversion"
 version = "1.0.6"
@ -1740,18 +1742,18 @@ checksum = "a41d061efea015927ac527063765e73601444cdc344ba855bc7bd44578b25e1c"

 [[package]]
 name = "serde"
-version = "1.0.143"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53e8e5d5b70924f74ff5c6d64d9a5acd91422117c60f48c4e07855238a254553"
+checksum = "d193d69bae983fc11a79df82342761dfbf28a99fc8d203dca4c3c1b590948965"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.143"
+version = "1.0.147"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d3d8e8de557aee63c26b85b947f5e59b690d0454c753f3adeb5cd7835ab88391"
+checksum = "4f1d362ca8fc9c3e3a7484440752472d68a6caa98f1ab81d99b5dfe517cec852"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1760,9 +1762,9 @@ dependencies = [

 [[package]]
 name = "serde_json"
-version = "1.0.83"
+version = "1.0.88"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38dd04e3c8279e75b31ef29dbdceebfe5ad89f4d0937213c53f7d49d01b3d5a7"
+checksum = "8e8b3801309262e8184d9687fb697586833e939767aea0dda89f5a8e650e8bd7"
 dependencies = [
 "itoa",
 "ryu",
@ -1830,9 +1832,9 @@ checksum = "eb703cfe953bccee95685111adeedb76fabe4e97549a58d16f03ea7b9367bb32"

 [[package]]
 name = "smallvec"
-version = "1.8.0"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
+checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"

 [[package]]
 name = "socket2"
@ -1846,9 +1848,9 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "1.0.96"
+version = "1.0.102"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0748dd251e24453cb8717f0354206b91557e4ec8703673a4b30208f2abaf1ebf"
+checksum = "3fcd952facd492f9be3ef0d0b7032a6e442ee9b361d4acc2b1d0c4aaa5f613a1"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1933,16 +1935,15 @@ checksum = "cda74da7e1a664f795bb1f8a87ec406fb89a02522cf6e50620d016add6dbbf5c"

 [[package]]
 name = "tokio"
-version = "1.20.1"
+version = "1.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a8325f63a7d4774dd041e363b2409ed1c5cbbd0f867795e661df066b2b0a581"
+checksum = "d76ce4a75fb488c605c54bf610f221cea8b0dafb53333c1a67e8ee199dcd2ae3"
 dependencies = [
 "autocfg",
 "bytes",
 "libc",
 "memchr",
 "mio",
- "once_cell",
 "parking_lot",
 "pin-project-lite",
 "signal-hook-registry",
@ -1991,9 +1992,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"

 [[package]]
 name = "tracing"
-version = "0.1.36"
+version = "0.1.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2fce9567bd60a67d08a16488756721ba392f24f29006402881e43b19aac64307"
+checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
 dependencies = [
 "cfg-if",
 "log",
@ -2004,22 +2005,21 @@ dependencies = [

 [[package]]
 name = "tracing-actix-web"
-version = "0.6.0"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f0b2cd6e5074ff67679a0ff68bc6333be78d29910ba7cd295d948aa5ff152032"
+checksum = "d725b8fa6ef307b3f4856913523337de45c47cc79271bafd7acfb39559e3a2da"
 dependencies = [
 "actix-web",
 "pin-project",
 "tracing",
- "tracing-futures",
 "uuid",
 ]

 [[package]]
 name = "tracing-attributes"
-version = "0.1.22"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "11c75893af559bc8e10716548bdef5cb2b983f8e637db9d0e15126b61b484ee2"
+checksum = "4017f8f45139870ca7e672686113917c71c7a6e02d4924eda67186083c03081a"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2028,9 +2028,9 @@ dependencies = [

 [[package]]
 name = "tracing-bunyan-formatter"
-version = "0.3.3"
+version = "0.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a788f2119fde477cd33823330c14004fa8cdac6892fd6f12181bbda9dbf14fc9"
+checksum = "a2445962f94a813b2aaea29ceeccb6dce9fd3aa5b1cb45595cde755b00d021ad"
 dependencies = [
 "gethostname",
 "log",
@ -2045,9 +2045,9 @@ dependencies = [

 [[package]]
 name = "tracing-core"
-version = "0.1.29"
+version = "0.1.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aeea4303076558a00714b823f9ad67d58a3bbda1df83d8827d21193156e22f7"
+checksum = "24eb03ba0eab1fd845050058ce5e616558e8f8d8fca633e6b163fe25c797213a"
 dependencies = [
 "once_cell",
 "valuable",
@ -2076,12 +2076,12 @@ dependencies = [

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.15"
+version = "0.3.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "60db860322da191b40952ad9affe65ea23e7dd6a5c442c2c42865810c6ab8e6b"
+checksum = "a6176eae26dd70d0c919749377897b54a9276bd7061339665dd68777926b5a70"
 dependencies = [
- "ansi_term",
 "matchers",
+ "nu-ansi-term",
 "once_cell",
 "regex",
 "sharded-slab",
@ -2100,9 +2100,9 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"

 [[package]]
 name = "ttf-parser"
-version = "0.6.2"
+version = "0.15.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5d7cd7ab3e47dda6e56542f4bbf3824c15234958c6e1bd6aaa347e93499fdc"
+checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd"

 [[package]]
 name = "typenum"
--- a/Cargo.toml
+++ b/Cargo.toml
@ -1,6 +1,6 @@
 [package]
 name = "hoc"
-version = "0.22.4"
+version = "0.27.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2018"
 build = "build.rs"
@ -14,34 +14,34 @@ name = "hoc"

 [dependencies]
 actix-rt = "2.7.0"
-actix-web = "4.1.0"
-badge = "0.3.0"
+actix-web = "4.2.1"
+badgers = "1.0.0"
 bytes = "1.2.1"
 config = { version = "0.13.2", features = ["toml"] }
-dotenv = "0.15.0"
-futures = "0.3.21"
+dotenvy = "0.15.6"
+futures = "0.3.25"
 git2 = "0.15.0"
 lazy_static = "1.4.0"
 mime = "0.3"
 number_prefix = "0.4.0"
 openssl-probe = "0.1.5"
-reqwest = "0.11.11"
-serde = "1.0.143"
+reqwest = "0.11.13"
+serde = "1.0.147"
 serde_derive = "1.0.137"
-serde_json = "1.0.83"
-tracing = "0.1.36"
-tracing-actix-web = "0.6.0"
-tracing-bunyan-formatter = "0.3.3"
+serde_json = "1.0.88"
+tracing = "0.1.37"
+tracing-actix-web = "0.6.2"
+tracing-bunyan-formatter = "0.3.4"
 tracing-futures = "0.2.5"
 tracing-log = "0.1.3"
-tracing-subscriber = { version = "0.3.15", features = ["registry", "env-filter"] }
+tracing-subscriber = { version = "0.3.16", features = ["registry", "env-filter"] }

 [build-dependencies]
-ructe = { version = "0.14.0", features = ["mime03"] }
+ructe = { version = "0.15.0", features = ["mime03"] }
 vergen = { version = "7.3.1", default-features = false, features = ["git"] }

 [dev-dependencies]
-awc = "3.0.0"
-ructe = "0.14.0"
+awc = "3.0.1"
+ructe = "0.15.0"
 tempfile = "3.3.0"
-tokio = "1.20.1"
+tokio = "1.22.0"
--- a/12
+++ b/12
@ -1,10 +1,13 @@
-FROM ekidd/rust-musl-builder:stable as builder
+# FROM ekidd/rust-musl-builder:stable as builder
+FROM clux/muslrust:stable as builder

 # create new cargo project
-RUN USER=rust cargo init --lib
+RUN cargo init --lib
+# RUN USER=rust cargo init --lib
 RUN echo 'fn main() { println!("Hello, world!"); }' >> src/main.rs
 # copy build config
-COPY --chown=rust ./Cargo.lock ./Cargo.lock
+# COPY --chown=rust ./Cargo.lock ./Cargo.lock
+COPY ./Cargo.lock ./Cargo.lock
 COPY ./Cargo.toml ./Cargo.toml
 # HACK: remove build-dependencies so we have at least some caching
 RUN head -n $(($(grep -n "\[build-dependencies\]" Cargo.toml | cut -f1 -d:) - 1)) Cargo.toml | sed '/build.rs/d' > \
@ -38,6 +41,7 @@ USER hoc
 # FROM scratch
 # COPY --from=linuxkit/ca-certificates:v0.7 / /

-COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
+# COPY --from=builder /home/rust/src/target/x86_64-unknown-linux-musl/release/hoc .
+COPY --from=builder /volume/target/x86_64-unknown-linux-musl/release/hoc .

 ENTRYPOINT ["/home/hoc/hoc"]
--- a/src/count.rs
+++ b/src/count.rs
@ -1,27 +1,30 @@
 use crate::error::Result;
-use std::{fs::read_dir, path::Path, result::Result as StdResult};
+use std::{
+    fs::{read_dir, ReadDir},
+    iter::once,
+    path::Path,
+    result::Result as StdResult,
+};

+/// The on disk layout for served repos is `<service>/<user>/<repo>`
+/// so to get the amount of repos, we just have to count everything
+/// in `*/*/*` to get the count.
 #[instrument]
-pub(crate) fn count_repositories<P>(repo_path: P) -> Result<usize>
+pub fn count_repositories<P>(repo_path: P) -> Result<usize>
 where
    P: AsRef<Path> + std::fmt::Debug,
 {
    trace!("Counting repositories");
    std::fs::create_dir_all(&repo_path)?;
-    Ok(read_dir(repo_path)?
-        .filter_map(StdResult::ok)
-        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        .map(|entry| read_dir(entry.path()))
-        .filter_map(StdResult::ok)
-        .flat_map(|dir| {
-            dir.filter_map(StdResult::ok)
-                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        })
-        .map(|entry| read_dir(entry.path()))
-        .filter_map(StdResult::ok)
-        .flat_map(|dir| {
-            dir.filter_map(StdResult::ok)
-                .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
-        })
+    Ok(once(read_dir(repo_path)?)
+        .flat_map(sub_directories)
+        .flat_map(sub_directories)
+        .flat_map(sub_directories)
        .count())
 }
+
+fn sub_directories(dir: ReadDir) -> impl Iterator<Item = ReadDir> {
+    dir.filter_map(StdResult::ok)
+        .filter(|entry| entry.file_type().map(|ft| ft.is_dir()).unwrap_or(false))
+        .filter_map(|entry| read_dir(entry.path()).ok())
+}
--- a/src/error.rs
+++ b/src/error.rs
@ -5,7 +5,7 @@ use std::fmt;
 pub(crate) type Result<T> = std::result::Result<T, Error>;

 #[derive(Debug)]
-pub(crate) enum Error {
+pub enum Error {
    Badge(String),
    Client(reqwest::Error),
    Git(git2::Error),
--- a/src/lib.rs
+++ b/src/lib.rs
@ -11,7 +11,7 @@ extern crate tracing;

 mod cache;
 pub mod config;
-mod count;
+pub mod count;
 mod error;
 mod service;
 mod statics;
@ -24,7 +24,7 @@ use crate::{
    error::{Error, Result},
    service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
    statics::{CLIENT, VERSION_INFO},
-    template::RepoInfo,
+    template::{RepoGeneratorInfo, RepoInfo},
 };
 use actix_web::{
    dev::Server,
@ -32,7 +32,7 @@ use actix_web::{
    middleware::{self, TrailingSlash},
    web, App, HttpResponse, HttpServer, Responder,
 };
-use badge::{Badge, BadgeOptions};
+use badgers::{Badge, BadgeOptions};
 use git2::{BranchType, Repository};
 use number_prefix::NumberPrefix;
 use std::{
@ -56,6 +56,7 @@ struct GeneratorForm<'a> {
    service: FormService,
    user: Cow<'a, str>,
    repo: Cow<'a, str>,
+    branch: Option<Cow<'a, str>>,
 }

 #[derive(Debug)]
@ -117,7 +118,7 @@ fn hoc(repo: &str, repo_dir: &str, cache_dir: &str, branch: &str) -> Result<(u64
        "-M".to_string(),
        "--diff-filter=ACDM".to_string(),
    ];
-    let cache = CacheState::read_from_file(&cache_dir, branch, &head)?;
+    let cache = CacheState::read_from_file(cache_dir, branch, &head)?;
    match &cache {
        CacheState::Current { count, commits, .. } => {
            info!("Using cache");
@ -438,16 +439,23 @@ async fn generate(
    state: web::Data<State>,
    repo_count: web::Data<AtomicUsize>,
 ) -> Result<HttpResponse> {
-    let repo = format!("{}/{}", params.user, params.repo);
    let mut buf = Vec::new();
+    let repo_info = RepoGeneratorInfo {
+        service: params.service,
+        user: &params.user,
+        repo: &params.repo,
+        branch: params
+            .branch
+            .as_deref()
+            .filter(|s| !s.is_empty())
+            .unwrap_or("master"),
+    };
    templates::generate(
        &mut buf,
        VERSION_INFO,
        repo_count.load(Ordering::Relaxed),
        &state.settings.base_url,
-        params.service.url(),
-        params.service.service(),
-        &repo,
+        &repo_info,
    )?;

    Ok(HttpResponse::Ok().content_type("text/html").body(buf))
--- a/src/main.rs
+++ b/src/main.rs
@ -3,7 +3,7 @@ use hoc::{config::Settings, telemetry};
 use std::net::TcpListener;

 fn init() {
-    dotenv::dotenv().ok();
+    dotenvy::dotenv().ok();
    openssl_probe::init_ssl_cert_env_vars();

    telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))
--- a/src/service.rs
+++ b/src/service.rs
@ -28,8 +28,8 @@ pub(crate) trait Service: Sized + 'static {
    }
 }

-#[derive(Deserialize, Serialize)]
-pub(crate) enum FormService {
+#[derive(Deserialize, Serialize, Clone, Copy)]
+pub enum FormService {
    #[serde(rename = "github")]
    GitHub,
    #[serde(rename = "gitlab")]
--- a/src/template.rs
+++ b/src/template.rs
@ -1,3 +1,5 @@
+use crate::service::FormService;
+
 pub struct RepoInfo<'a> {
    pub commit_url: &'a str,
    pub commits: u64,
@ -9,3 +11,10 @@ pub struct RepoInfo<'a> {
    pub url: &'a str,
    pub branch: &'a str,
 }
+
+pub struct RepoGeneratorInfo<'a> {
+    pub service: FormService,
+    pub user: &'a str,
+    pub repo: &'a str,
+    pub branch: &'a str,
+}
--- a/templates/generate.rs.html
+++ b/templates/generate.rs.html
@ -1,16 +1,16 @@
@use super::base;
-@use crate::statics::VersionInfo;
+@use crate::{statics::VersionInfo, template::RepoGeneratorInfo};

-@(version_info: VersionInfo, repo_count: usize, base_url: &str, url: &str, service: &str, path: &str)
+@(version_info: VersionInfo, repo_count: usize, base_url: &str, repo_info: &RepoGeneratorInfo)

@:base("Hits-of-Code Badges", "Badge Generator", {

 <p>
-Here is the markdown for the badge for <a href="https://@url/@path">@url/@path</a>
+Here is the markdown for the badge for <a href="https://@repo_info.service.url()/@repo_info.user/@repo_info.repo">@repo_info.user/@repo_info.repo</a>
 </p>

 <pre>
-[![Hits-of-Code](@base_url/@service/@path)](@base_url/@service/@path/view)
+[![Hits-of-Code](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch)](@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch)
 </pre>

 <p>
@ -18,6 +18,6 @@ It will be rendered like this
 </p>

 <pre>
-<a href="@base_url/@service/@path/view"><img src="@base_url/@service/@path" alt="example badge" /></a>
+<a href="@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo/view?branch=@repo_info.branch"><img src="@base_url/@repo_info.service.service()/@repo_info.user/@repo_info.repo?branch=@repo_info.branch" alt="example badge" /></a>
 </pre>
 }, version_info, repo_count)
--- a/templates/index.rs.html
+++ b/templates/index.rs.html
@ -80,6 +80,8 @@ the lines of
    <input name="user" id="user" type="text" placeholder="user" />
    <label>/</label>
    <input name="repo" id="repo" type="text" placeholder="repository" />
+    <label>:</label>
+    <input name="branch" id="branch" type="text" placeholder="branch (defaults to `master`)" />
    <button type="submit">Generate</button>
 </form>

--- a/tests/count.rs
+++ b/tests/count.rs
@ -0,0 +1,66 @@
+use hoc::count::count_repositories;
+
+use tempfile::TempDir;
+
+#[test]
+fn no_repos() {
+    let repos = TempDir::new().unwrap();
+    assert_eq!(0, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn no_repos_for_provider() {
+    let repos = TempDir::new().unwrap();
+    let _provider = TempDir::new_in(&repos).unwrap();
+    assert_eq!(0, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn no_repos_for_owner() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let _owner = TempDir::new_in(&provider).unwrap();
+    assert_eq!(0, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn one_repo_for_owner() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let owner = TempDir::new_in(&provider).unwrap();
+    let _repo = TempDir::new_in(&owner).unwrap();
+    assert_eq!(1, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn two_repos_for_owner() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let owner = TempDir::new_in(&provider).unwrap();
+    let _repo1 = TempDir::new_in(&owner).unwrap();
+    let _repo2 = TempDir::new_in(&owner).unwrap();
+    assert_eq!(2, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn two_repos_for_two_providers() {
+    let repos = TempDir::new().unwrap();
+    let provider1 = TempDir::new_in(&repos).unwrap();
+    let owner1 = TempDir::new_in(&provider1).unwrap();
+    let _repo1 = TempDir::new_in(&owner1).unwrap();
+    let provider2 = TempDir::new_in(&repos).unwrap();
+    let owner2 = TempDir::new_in(&provider2).unwrap();
+    let _repo2 = TempDir::new_in(&owner2).unwrap();
+    assert_eq!(2, count_repositories(&repos).unwrap())
+}
+
+#[test]
+fn two_subdirs_in_one_repo() {
+    let repos = TempDir::new().unwrap();
+    let provider = TempDir::new_in(&repos).unwrap();
+    let owner = TempDir::new_in(&provider).unwrap();
+    let repo = TempDir::new_in(&owner).unwrap();
+    let _subdir1 = TempDir::new_in(&repo).unwrap();
+    let _subdir2 = TempDir::new_in(&repo).unwrap();
+    assert_eq!(1, count_repositories(&repos).unwrap())
+}
--- a/tests/resources.rs
+++ b/tests/resources.rs
@ -14,18 +14,3 @@ async fn favicon() {

    assert!(response.status().is_success());
 }
-
-#[actix_rt::test]
-async fn tacit_css() {
-    let test_app = util::spawn_app().await;
-
-    let client = awc::Client::default();
-
-    let response = client
-        .get(&format!("{}/tacit-css.min.css", test_app.address))
-        .send()
-        .await
-        .expect("Failed to execute request");
-
-    assert!(response.status().is_success());
-}
--- a/tests/util/mod.rs
+++ b/tests/util/mod.rs
@ -14,8 +14,9 @@ lazy_static::lazy_static! {

 pub struct TestApp {
    pub address: String,
-    repo_dir: TempDir,
-    cache_dir: TempDir,
+    // Those are unused but are hold to be dropped and deleted after the TestApp goes out of scope
+    _repo_dir: TempDir,
+    _cache_dir: TempDir,
 }

 pub async fn spawn_app() -> TestApp {
@ -26,15 +27,12 @@ pub async fn spawn_app() -> TestApp {
    let port = listener.local_addr().unwrap().port();
    let address = format!("http://127.0.0.1:{}", port);

-    let repo_dir = tempdir().expect("Cannot create repo_dir");
-    let cache_dir = tempdir().expect("Cannot create cache_dir");
+    let _repo_dir = tempdir().expect("Cannot create repo_dir");
+    let _cache_dir = tempdir().expect("Cannot create cache_dir");

    let mut settings = Settings::load().expect("Failed to read configuration.");
-    settings.repodir = repo_dir.path().to_path_buf();
-    settings.cachedir = cache_dir.path().to_path_buf();
-    // configuration.database.database_name = Uuid::new_v4().to_string();
-
-    // let connection_pool = configure_database(&configuration.database).await;
+    settings.repodir = _repo_dir.path().to_path_buf();
+    settings.cachedir = _cache_dir.path().to_path_buf();

    let server = hoc::run(listener, settings)
        .await
@ -44,7 +42,7 @@ pub async fn spawn_app() -> TestApp {

    TestApp {
        address,
-        repo_dir,
-        cache_dir,
+        _repo_dir,
+        _cache_dir,
    }
 }