Apply cargo update and cargo upgrade

Bumps [vergen](https://github.com/rustyhorde/vergen) from 8.2.1 to 8.2.3.
- [Release notes](https://github.com/rustyhorde/vergen/releases)
- [Commits](https://github.com/rustyhorde/vergen/compare/8.2.1...8.2.3)

---
updated-dependencies:
- dependency-name: vergen
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/dependabot.yml

@@ -10,3 +10,15 @@ updates:
       - vbrandl
     labels:
       - dependencies
+      - dependabot
+
+  - package-ecosystem: 'github-actions'
+    directory: '/'
+    schedule:
+      interval: 'daily'
+    open-pull-requests-limit: 10
+    assignees:
+      - vbrandl
+    labels:
+      - dependabot
+      - dependencies

.github/workflows/audit.yml

@@ -16,6 +16,6 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions-rs/audit-check@v1
+      - uses: rustsec/audit-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/dependabot-changelog.yml

@@ -0,0 +1,26 @@
+name: 'Dependabot Changelog'
+on:
+  pull_request:
+    types:
+      - opened
+      - synchronize
+      - reopened
+      - ready_for_review
+      - labeled
+      - unlabeled
+
+jobs:
+  changelog:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          token: ${{ secrets.ACTION_TOKEN }}
+      - uses: dangoslen/dependabot-changelog-helper@v3
+        with:
+          activationLabel: 'dependabot'
+      - uses: stefanzweifel/git-auto-commit-action@v4
+        with:
+          commit_message: "Update Changelog"

.github/workflows/release.yml

@@ -42,7 +42,7 @@ jobs:
           override: true
 
       - name: Cache cargo registry, index and build directory
-        uses: actions/cache@v2
+        uses: actions/cache@v3
         with:
           path: |
             ~/.cargo/registry

.github/workflows/rust.yml

@@ -16,18 +16,11 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          components: rustfmt
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Check Formatting
-        uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
+        run: cargo fmt --all -- --check
+
 
   clippy:
     name: Clippy
@@ -37,12 +30,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
-          components: rustfmt
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Cache cargo registry, index and build directory
         uses: actions/cache@v3
@@ -54,10 +42,13 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Clippy Linting
-        uses: actions-rs/cargo@v1
-        with:
-          command: clippy
-          args: -- -D warnings
+        run: cargo clippy --all-features -- -Dclippy::all
+        # TODO
+        # run: cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic
+      - name: Clippy Test Linting
+        run: cargo clippy --tests -- -Dclippy::all
+        # TODO
+        # run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
 
 
   test:
@@ -74,11 +65,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Install stable toolchain
-        uses: actions-rs/toolchain@v1
-        with:
-          toolchain: stable
-          profile: minimal
-          override: true
+        uses: dtolnay/rust-toolchain@stable
 
       - name: Cache cargo registry, index and build directory
         uses: actions/cache@v3
@@ -90,6 +77,4 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Run Tests
-        uses: actions-rs/cargo@v1
-        with:
-          command: test
+        run: cargo test

CHANGELOG.md

@@ -4,6 +4,20 @@ 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]
+### Dependencies
+- Bump `serde` from 1.0.160 to 1.0.166 (#613, #617, #627, #636)
+- Bump `actions/cache` from 2 to 3 (#616)
+- Bump `tokio` from 1.28.0 to 1.29.1 (#618, #625, #633, #634)
+- Bump `reqwest` from 0.11.17 to 0.11.18 (#619)
+- Bump `vergen` from 8.1.3 to 8.2.3 (#621, #622, #635)
+- Bump `tracing-actix-web` from 0.7.4 to 0.7.5 (#623)
+- Bump `git2` from 0.17.1 to 0.17.2 (#624)
+- Bump `tempfile` from 3.5.0 to 3.6.0 (#626)
+- Bump `serde_json` from 1.0.96 to 1.0.99 (#630, #632)
+- Bump `openssl` from 0.10.50 to 0.10.55 (#631)
+
+
+## [0.35.0] 2023-05-04
 
 * Updated [`h2`](https://github.com/hyperium/h2) from 0.3.16 to 0.3.17, fixes [SEC#11] ([#599])
 * Updated [`git2`](https://github.com/rust-lang/git2-rs) from 0.16.1 to 0.17.0 ([#602])
@@ -13,6 +27,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Updated [`tracing`](https://github.com/tokio-rs/tracing) from 0.1.37 to 0.1.38 ([#607])
 * Updated [`vergen`](https://github.com/rustyhorde/vergen) from 8.1.1 to 8.1.3 ([#608])
 * Downgrade yanked [`tracing`](https://github.com/tokio-rs/tracing) 0.1.38 to 0.1.37 ([#611])
+* Updated [`reqwest`](https://github.com/seanmonstar/reqwest) from 0.11.16 to 0.11.17 ([#609])
+* Updated [`anyhow`](https://github.com/dtolnay/anyhow) from 1.0.70 to 1.0.71 ([#610])
 
 [#599]: https://github.com/vbrandl/hoc/pull/599
 [#602]: https://github.com/vbrandl/hoc/pull/602
@@ -22,6 +38,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#607]: https://github.com/vbrandl/hoc/pull/607
 [#608]: https://github.com/vbrandl/hoc/pull/608
 [#611]: https://github.com/vbrandl/hoc/pull/611
+[#609]: https://github.com/vbrandl/hoc/pull/609
+[#610]: https://github.com/vbrandl/hoc/pull/610
 
 [SEC#11]: https://github.com/vbrandl/hoc/security/dependabot/11
 
@@ -220,4 +238,4 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#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
+[#508]: https://github.com/vbrandl/hoc/pull/508

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "hoc"
-version = "0.34.0"
+version = "0.35.0"
 authors = ["Valentin Brandl <vbrandl@riseup.net>"]
 edition = "2021"
 build = "src/build.rs"
@@ -19,30 +19,30 @@ badgers = "1.2.0"
 bytes = "1.4.0"
 config = { version = "0.13.3", features = ["toml"] }
 dotenvy = "0.15.7"
-futures = "0.3.27"
-git2 = "0.17.1"
+futures = "0.3.28"
+git2 = "0.17.2"
 lazy_static = "1.4.0"
 mime = "0.3"
 number_prefix = "0.4.0"
 openssl-probe = "0.1.5"
-reqwest = "0.11.16"
-serde = "1.0.158"
-serde_derive = "1.0.137"
-serde_json = "1.0.94"
+reqwest = "0.11.18"
+serde = "1.0.166"
+serde_derive = "1.0.166"
+serde_json = "1.0.99"
 tracing = "0.1.37"
-tracing-actix-web = "0.7.3"
-tracing-bunyan-formatter = "0.3.6"
+tracing-actix-web = "0.7.5"
+tracing-bunyan-formatter = "0.3.7"
 tracing-futures = "0.2.5"
 tracing-log = "0.1.3"
 tracing-subscriber = { version = "0.3.17", features = ["registry", "env-filter"] }
 
 [build-dependencies]
-anyhow = "1.0.70"
+anyhow = "1.0.71"
 ructe = { version = "0.16.1", features = ["mime03"] }
-vergen = { version = "8.1.3", default-features = false, features = ["git", "gitoxide"] }
+vergen = { version = "8.2.3", default-features = false, features = ["git", "gitoxide"] }
 
 [dev-dependencies]
 awc = "3.1.1"
 ructe = "0.16.1"
-tempfile = "3.5.0"
-tokio = "1.28.0"
+tempfile = "3.6.0"
+tokio = "1.29.1"

src/cache.rs

@@ -36,10 +36,10 @@ impl<'a> CacheState<'a> {
         trace!("Reading cache");
         if path.as_ref().exists() {
             let cache: Cache = serde_json::from_reader(BufReader::new(File::open(path)?))?;
-            Ok(cache
-                .entries
-                .get(branch)
-                .map(|c| {
+            Ok(cache.entries.get(branch).map_or_else(
+                // TODO: get rid of clone
+                || CacheState::NoneForBranch(cache.clone()),
+                |c| {
                     if c.head == head {
                         trace!("Cache is up to date");
                         CacheState::Current {
@@ -56,9 +56,8 @@ impl<'a> CacheState<'a> {
                             cache: cache.clone(),
                         }
                     }
-                })
-                // TODO: get rid of clone
-                .unwrap_or_else(|| CacheState::NoneForBranch(cache.clone())))
+                },
+            ))
         } else {
             Ok(CacheState::No)
         }

src/config.rs

@@ -18,6 +18,12 @@ pub struct Settings {
 }
 
 impl Settings {
+    /// Load the configuration from file and environment.
+    ///
+    /// # Errors
+    ///
+    /// * File cannot be read or parsed
+    /// * Environment variables cannot be parsed
     pub fn load() -> Result<Self, ConfigError> {
         Config::builder()
             .add_source(File::with_name("hoc.toml").required(false))

src/lib.rs

@@ -22,7 +22,7 @@ use crate::{
     cache::CacheState,
     config::Settings,
     error::{Error, Result},
-    service::{Bitbucket, FormService, GitHub, Gitlab, Service, Sourcehut},
+    service::{Bitbucket, FormValue, GitHub, Gitlab, Service, Sourcehut},
     statics::{CLIENT, VERSION_INFO},
     template::{RepoGeneratorInfo, RepoInfo},
 };
@@ -53,7 +53,7 @@ include!(concat!(env!("OUT_DIR"), "/templates.rs"));
 
 #[derive(Deserialize, Serialize)]
 struct GeneratorForm<'a> {
-    service: FormService,
+    service: FormValue,
     user: Cow<'a, str>,
     repo: Cow<'a, str>,
     branch: Option<Cow<'a, str>>,
@@ -309,7 +309,7 @@ pub(crate) async fn json_hoc<T: Service>(
     let branch = branch.branch.as_deref().unwrap_or("master");
     let rc_clone = repo_count.clone();
     let mapper = move |r| match r {
-        HocResult::NotFound => p404(rc_clone),
+        HocResult::NotFound => p404(&rc_clone),
         HocResult::Hoc {
             hoc, head, commits, ..
         } => Ok(HttpResponse::Ok().json(JsonResponse {
@@ -345,7 +345,7 @@ pub(crate) async fn calculate_hoc<T: Service>(
     let rc_clone = repo_count.clone();
     let label = query.label.clone();
     let mapper = move |r| match r {
-        HocResult::NotFound => p404(rc_clone),
+        HocResult::NotFound => p404(&rc_clone),
         HocResult::Hoc { hoc_pretty, .. } => {
             let badge_opt = BadgeOptions {
                 subject: label,
@@ -386,7 +386,7 @@ async fn overview<T: Service>(
     let base_url = state.settings.base_url.clone();
     let rc_clone = repo_count.clone();
     let mapper = move |r| match r {
-        HocResult::NotFound => p404(rc_clone),
+        HocResult::NotFound => p404(&rc_clone),
         HocResult::Hoc {
             hoc,
             commits,
@@ -413,7 +413,7 @@ async fn overview<T: Service>(
                 VERSION_INFO,
                 rc_clone.load(Ordering::Relaxed),
                 repo_info,
-                label,
+                &label,
             )?;
 
             Ok(HttpResponse::Ok().content_type("text/html").body(buf))
@@ -423,11 +423,13 @@ async fn overview<T: Service>(
 }
 
 #[get("/health_check")]
+#[allow(clippy::unused_async)]
 async fn health_check() -> HttpResponse {
     HttpResponse::Ok().finish()
 }
 
 #[get("/")]
+#[allow(clippy::unused_async)]
 async fn index(
     state: web::Data<State>,
     repo_count: web::Data<AtomicUsize>,
@@ -443,6 +445,7 @@ async fn index(
 }
 
 #[post("/generate")]
+#[allow(clippy::unused_async)]
 async fn generate(
     params: web::Form<GeneratorForm<'_>>,
     state: web::Data<State>,
@@ -470,20 +473,22 @@ async fn generate(
     Ok(HttpResponse::Ok().content_type("text/html").body(buf))
 }
 
-fn p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
+fn p404(repo_count: &web::Data<AtomicUsize>) -> Result<HttpResponse> {
     let mut buf = Vec::new();
     templates::p404_html(&mut buf, VERSION_INFO, repo_count.load(Ordering::Relaxed))?;
     Ok(HttpResponse::NotFound().content_type("text/html").body(buf))
 }
 
+#[allow(clippy::unused_async)]
 async fn async_p404(repo_count: web::Data<AtomicUsize>) -> Result<HttpResponse> {
-    p404(repo_count)
+    p404(&repo_count)
 }
 
 /// A duration to add to current time for a far expires header.
 static FAR: Duration = Duration::from_secs(180 * 24 * 60 * 60);
 
 #[get("/static/{filename}")]
+#[allow(clippy::unused_async)]
 async fn static_file(
     path: web::Path<String>,
     repo_count: web::Data<AtomicUsize>,
@@ -496,11 +501,11 @@ async fn static_file(
                 .content_type(data.mime.clone())
                 .body(data.content)
         })
-        .map(Result::Ok)
-        .unwrap_or_else(|| p404(repo_count))
+        .map_or_else(|| p404(&repo_count), Result::Ok)
 }
 
 #[get("/favicon.ico")]
+#[allow(clippy::unused_async)]
 async fn favicon32() -> HttpResponse {
     let data = &template_statics::favicon32_png;
     HttpResponse::Ok()
@@ -508,6 +513,7 @@ async fn favicon32() -> HttpResponse {
         .body(data.content)
 }
 
+#[allow(clippy::unused_async)]
 async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
     let workers = settings.workers;
     let repo_count =
@@ -536,6 +542,11 @@ async fn start_server(listener: TcpListener, settings: Settings) -> std::io::Res
     .run())
 }
 
+/// Start the server.
+///
+/// # Errors
+///
+/// * server cannot bind to `listener`
 pub async fn run(listener: TcpListener, settings: Settings) -> std::io::Result<Server> {
     let span = info_span!("hoc", version = env!("CARGO_PKG_VERSION"));
     let _ = span.enter();

src/service.rs

@@ -29,7 +29,7 @@ pub(crate) trait Service: Sized + 'static {
 }
 
 #[derive(Deserialize, Serialize, Clone, Copy)]
-pub enum FormService {
+pub enum FormValue {
     #[serde(rename = "github")]
     GitHub,
     #[serde(rename = "gitlab")]
@@ -40,22 +40,22 @@ pub enum FormService {
     Sourcehut,
 }
 
-impl FormService {
+impl FormValue {
     pub(crate) fn url(&self) -> &str {
         match self {
-            FormService::GitHub => "github.com",
-            FormService::Gitlab => "gitlab.com",
-            FormService::Bitbucket => "bitbucket.org",
-            FormService::Sourcehut => "git.sr.ht",
+            FormValue::GitHub => "github.com",
+            FormValue::Gitlab => "gitlab.com",
+            FormValue::Bitbucket => "bitbucket.org",
+            FormValue::Sourcehut => "git.sr.ht",
         }
     }
 
     pub(crate) fn service(&self) -> &str {
         match self {
-            FormService::GitHub => "github",
-            FormService::Gitlab => "gitlab",
-            FormService::Bitbucket => "bitbucket",
-            FormService::Sourcehut => "sourcehut",
+            FormValue::GitHub => "github",
+            FormValue::Gitlab => "gitlab",
+            FormValue::Bitbucket => "bitbucket",
+            FormValue::Sourcehut => "sourcehut",
         }
     }
 }

src/statics.rs

@@ -1,3 +1,4 @@
+#[derive(Clone, Copy)]
 pub struct VersionInfo<'a> {
     pub commit: &'a str,
     pub version: &'a str,

src/template.rs

@@ -1,5 +1,6 @@
-use crate::service::FormService;
+use crate::service::FormValue;
 
+#[derive(Clone, Copy)]
 pub struct RepoInfo<'a> {
     pub commit_url: &'a str,
     pub commits: u64,
@@ -13,7 +14,7 @@ pub struct RepoInfo<'a> {
 }
 
 pub struct RepoGeneratorInfo<'a> {
-    pub service: FormService,
+    pub service: FormValue,
     pub user: &'a str,
     pub repo: &'a str,
     pub branch: &'a str,

templates/base.rs.html

@@ -1,4 +1,4 @@
-@use super::statics::*;
+@use super::statics::tacit_css_min_css;
 @use crate::statics::VersionInfo;
 
 @(title: &str, header: &str, content: Content, version_info: VersionInfo, repo_count: usize)

templates/overview.rs.html

@@ -2,7 +2,7 @@
 @use crate::statics::VersionInfo;
 @use crate::template::RepoInfo;
 
-@(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo, label: String)
+@(version_info: VersionInfo, repo_count: usize, repo_info: RepoInfo, label: &str)
 
 @:base_html("Hits-of-Code Badges", "Overview", {
 

tests/util/mod.rs

@@ -38,6 +38,8 @@ pub async fn spawn_app() -> TestApp {
         .await
         .expect("Failed to bind address");
 
+    #[allow(clippy::let_underscore_future)]
+    // don't await so the test server runs in the background
     let _ = tokio::spawn(server);
 
     TestApp {