Remove unnecessary mut and document possible panic

Bump tempfile from 3.7.1 to 3.8.0

.github/workflows/rust.yml

@@ -42,13 +42,9 @@ jobs:
           key: ${{ runner.os }}-cargo-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Clippy Linting
-        run: cargo clippy --all-features -- -Dclippy::all
+        run: cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic
-        # TODO
-        # run: cargo clippy --all-features -- -Dclippy::all -Dclippy::pedantic
       - name: Clippy Test Linting
-        run: cargo clippy --tests -- -Dclippy::all
+        run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
-        # TODO
-        # run: cargo clippy --tests -- -Dclippy::all -Dclippy::pedantic
 
 
   test:

CHANGELOG.md

@@ -5,14 +5,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 ### Dependencies
-- Bump `serde` from 1.0.160 to 1.0.164 (#613, #617, #627)
+- Bump `serde` from 1.0.160 to 1.0.183 (#613, #617, #627, #636, #639, #640, #645, [#648](https://github.com/vbrandl/hoc/pull/648), [#650](https://github.com/vbrandl/hoc/pull/650), [#652](https://github.com/vbrandl/hoc/pull/652), [#653](https://github.com/vbrandl/hoc/pull/653), [#654](https://github.com/vbrandl/hoc/pull/654), [#655](https://github.com/vbrandl/hoc/pull/655), [#657](https://github.com/vbrandl/hoc/pull/657))
 - Bump `actions/cache` from 2 to 3 (#616)
-- Bump `tokio` from 1.28.0 to 1.28.2 (#618, #625)
+- Bump `tokio` from 1.28.0 to 1.32.0 (#618, #625, #633, #634, [#659](https://github.com/vbrandl/hoc/pull/659), [#660](https://github.com/vbrandl/hoc/pull/660), [#665](https://github.com/vbrandl/hoc/pull/665))
 - Bump `reqwest` from 0.11.17 to 0.11.18 (#619)
-- Bump `vergen` from 8.1.3 to 8.2.1 (#621, #622)
+- Bump `vergen` from 8.1.3 to 8.2.4 (#621, #622, #635, #638)
-- Bump `tracing-actix-web` from 0.7.4 to 0.7.5 (#623)
+- Bump `tracing-actix-web` from 0.7.4 to 0.7.6 (#623, [#656](https://github.com/vbrandl/hoc/pull/656))
 - Bump `git2` from 0.17.1 to 0.17.2 (#624)
-- Bump `tempfile` from 3.5.0 to 3.6.0 (#626)
+- Bump `tempfile` from 3.5.0 to 3.8.0 (#626, [#646](https://github.com/vbrandl/hoc/pull/646), [#658](https://github.com/vbrandl/hoc/pull/658), [#667](https://github.com/vbrandl/hoc/pull/667))
+- Bump `serde_json` from 1.0.96 to 1.0.105 (#630, #632, #637, #641, #644, [#649](https://github.com/vbrandl/hoc/pull/649), [#663](https://github.com/vbrandl/hoc/pull/663))
+- Bump `openssl` from 0.10.50 to 0.10.55 (#631)
+- Bump `tracing-bunyan-formatter` from 0.3.7 to 0.3.9 (#642, [#661](https://github.com/vbrandl/hoc/pull/661))
+- Bump `anyhow` from 1.0.71 to 1.0.75 (#643, [#662](https://github.com/vbrandl/hoc/pull/662), [#664](https://github.com/vbrandl/hoc/pull/664))
+- Bump `ructe` from 0.16.1 to 0.17.0 ([#647](https://github.com/vbrandl/hoc/pull/647))
 
 
 ## [0.35.0] 2023-05-04

Cargo.toml

@@ -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"
+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.18"
-serde = "1.0.164"
+serde = "1.0.183"
-serde_derive = "1.0.137"
+serde_derive = "1.0.166"
-serde_json = "1.0.94"
+serde_json = "1.0.105"
 tracing = "0.1.37"
-tracing-actix-web = "0.7.5"
+tracing-actix-web = "0.7.6"
-tracing-bunyan-formatter = "0.3.6"
+tracing-bunyan-formatter = "0.3.9"
 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.71"
+anyhow = "1.0.75"
-ructe = { version = "0.16.1", features = ["mime03"] }
+ructe = { version = "0.17.0", features = ["mime03"] }
-vergen = { version = "8.2.1", default-features = false, features = ["git", "gitoxide"] }
+vergen = { version = "8.2.4", default-features = false, features = ["git", "gitoxide"] }
 
 [dev-dependencies]
 awc = "3.1.1"
-ructe = "0.16.1"
+ructe = "0.17.0"
-tempfile = "3.6.0"
+tempfile = "3.8.0"
-tokio = "1.28.2"
+tokio = "1.32.0"

src/cache.rs

@@ -74,7 +74,7 @@ impl<'a> CacheState<'a> {
         trace!("Calculating new cache");
         match self {
             CacheState::Old { mut cache, .. } => {
-                if let Some(mut cache) = cache.entries.get_mut(branch) {
+                if let Some(cache) = cache.entries.get_mut(branch) {
                     cache.head = head;
                     cache.count += count;
                     cache.commits += commits;

src/error.rs

@@ -41,17 +41,14 @@ impl ResponseError for Error {
 
     fn error_response(&self) -> HttpResponse {
         let mut buf = Vec::new();
-        match self {
+        if let Error::BranchNotFound = self {
-            Error::BranchNotFound => {
+            templates::p404_no_master_html(&mut buf, VERSION_INFO, 0).unwrap();
-                templates::p404_no_master_html(&mut buf, VERSION_INFO, 0).unwrap();
+            HttpResponse::NotFound().content_type("text/html").body(buf)
-                HttpResponse::NotFound().content_type("text/html").body(buf)
+        } else {
-            }
+            templates::p500_html(&mut buf, VERSION_INFO, 0).unwrap();
-            _ => {
+            HttpResponse::InternalServerError()
-                templates::p500_html(&mut buf, VERSION_INFO, 0).unwrap();
+                .content_type("text/html")
-                HttpResponse::InternalServerError()
+                .body(buf)
-                    .content_type("text/html")
-                    .body(buf)
-            }
         }
     }
 }

src/lib.rs

@@ -282,6 +282,7 @@ where
         }
         pull(&path)?;
         let (hoc, head, commits) = hoc(&service_url, &state.repos(), &state.cache(), branch)?;
+        #[allow(clippy::cast_precision_loss)]
         let hoc_pretty = match NumberPrefix::decimal(hoc as f64) {
             NumberPrefix::Standalone(hoc) => hoc.to_string(),
             NumberPrefix::Prefixed(prefix, hoc) => format!("{hoc:.1}{prefix}"),

src/main.rs

@@ -6,7 +6,7 @@ fn init() {
     dotenvy::dotenv().ok();
     openssl_probe::init_ssl_cert_env_vars();
 
-    telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"))
+    telemetry::init_subscriber(telemetry::get_subscriber("hoc", "info"));
 }
 
 #[actix_rt::main]

src/telemetry.rs

@@ -15,6 +15,10 @@ pub fn get_subscriber(name: &str, env_filter: &str) -> impl Subscriber + Send +
         .with(formatting_layer)
 }
 
+/// # Panics
+///
+/// This panics if the `LogTracer` cannot be initialized or `subscriber` cannot be set as global
+/// default.
 pub fn init_subscriber(subscriber: impl Subscriber + Send + Sync) {
     LogTracer::init().expect("Failed to set logger");
     set_global_default(subscriber).expect("Failed to set tracing subscriber");

tests/count.rs

@@ -5,14 +5,14 @@ use tempfile::TempDir;
 #[test]
 fn no_repos() {
     let repos = TempDir::new().unwrap();
-    assert_eq!(0, count_repositories(&repos).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())
+    assert_eq!(0, count_repositories(&repos).unwrap());
 }
 
 #[test]
@@ -20,7 +20,7 @@ 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())
+    assert_eq!(0, count_repositories(&repos).unwrap());
 }
 
 #[test]
@@ -29,7 +29,7 @@ fn one_repo_for_owner() {
     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())
+    assert_eq!(1, count_repositories(&repos).unwrap());
 }
 
 #[test]
@@ -39,7 +39,7 @@ fn two_repos_for_owner() {
     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())
+    assert_eq!(2, count_repositories(&repos).unwrap());
 }
 
 #[test]
@@ -51,7 +51,7 @@ fn two_repos_for_two_providers() {
     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())
+    assert_eq!(2, count_repositories(&repos).unwrap());
 }
 
 #[test]
@@ -62,5 +62,5 @@ fn two_subdirs_in_one_repo() {
     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())
+    assert_eq!(1, count_repositories(&repos).unwrap());
 }

tests/util/mod.rs

@@ -25,14 +25,14 @@ pub async fn spawn_app() -> TestApp {
     let listener = TcpListener::bind("127.0.0.1:0").expect("Failed to bind random port");
 
     let port = listener.local_addr().unwrap().port();
-    let address = format!("http://127.0.0.1:{}", port);
+    let address = format!("http://127.0.0.1:{port}");
 
-    let _repo_dir = tempdir().expect("Cannot create repo_dir");
+    let repo_dir = tempdir().expect("Cannot create repo_dir");
-    let _cache_dir = tempdir().expect("Cannot create cache_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.repodir = repo_dir.path().to_path_buf();
-    settings.cachedir = _cache_dir.path().to_path_buf();
+    settings.cachedir = cache_dir.path().to_path_buf();
 
     let server = hoc::run(listener, settings)
         .await
@@ -44,7 +44,7 @@ pub async fn spawn_app() -> TestApp {
 
     TestApp {
         address,
-        _repo_dir,
+        _repo_dir: repo_dir,
-        _cache_dir,
+        _cache_dir: cache_dir,
     }
 }