Upgrade Rust to 1.85, 2024 edition (#1410)

Author: vlad-ivanov-name

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.8@sha256:d6d396f3780b1dd56a3acbc975f57bd2fc501989b50164c41387c42d04e780d0
 
-ARG ALPINE_VERSION=3.20
+ARG ALPINE_VERSION=3.21
 ARG ARCH=x86_64
 
 FROM alpine:${ALPINE_VERSION} AS rust-base
@@ -17,7 +17,7 @@ ARG ARCH
 ARG RUSTUP_VERSION=1.27.1
 
 # Update check: https://github.com/rust-lang/rust/tags
-ARG RUST_VERSION=1.83.0
+ARG RUST_VERSION=1.85.0
 ARG RUST_ARCH=${ARCH}-unknown-linux-musl
 
 # https://github.com/sfackler/rust-openssl/issues/1462
@@ -34,7 +34,7 @@ RUN /tmp/rustup-init \
 FROM rust-base AS dev-planner
 
 # Update check: https://github.com/LukeMathWalker/cargo-chef/releases
-RUN cargo install --version 0.1.67 cargo-chef
+RUN cargo install --version 0.1.71 cargo-chef
 
 WORKDIR /usr/src/josh
 COPY . .
@@ -51,7 +51,7 @@ RUN apk add --no-cache \
 
 WORKDIR /usr/src/josh
 RUN rustup component add rustfmt
-RUN cargo install --version 0.1.67 cargo-chef
+RUN cargo install --version 0.1.71 cargo-chef
 RUN cargo install --verbose --version 0.10.0 graphql_client_cli
 
 RUN apk add --no-cache \

hyper_cgi/Cargo.toml

@@ -2,7 +2,7 @@
 name = "hyper_cgi"
 version = "22.10.25"
 authors = ["Christian Schilling <initcrash@gmail.com>", "Louis-Marie Givel <louis-marie.givel@esrlabs.com>"]
-edition = "2021"
+edition = "2024"
 license-file = "LICENSE"
 description = "Run CGI scripts with hyper"
 repository = "https://github.com/josh-project/josh"

hyper_cgi/src/bin/hyper-cgi-test-server.rs

@@ -2,7 +2,7 @@
 extern crate lazy_static;
 use core::iter;
 use core::str::from_utf8;
-use rand::{distributions::Alphanumeric, thread_rng, Rng};
+use rand::{Rng, distributions::Alphanumeric, thread_rng};
 use std::str::FromStr;
 
 use futures::FutureExt;
@@ -11,28 +11,20 @@ use hyper::server::Server;
 
 // Import the base64 crate Engine trait anonymously so we can
 // call its methods without adding to the namespace.
-use base64::engine::general_purpose::STANDARD as BASE64;
 use base64::engine::Engine as _;
+use base64::engine::general_purpose::STANDARD as BASE64;
 
 #[macro_export]
 macro_rules! some_or {
     ($e:expr, $b:block) => {
-        if let Some(x) = $e {
-            x
-        } else {
-            $b
-        }
+        if let Some(x) = $e { x } else { $b }
     };
 }
 
 #[macro_export]
 macro_rules! ok_or {
     ($e:expr, $b:block) => {
-        if let Ok(x) = $e {
-            x
-        } else {
-            $b
-        }
+        if let Ok(x) = $e { x } else { $b }
     };
 }
 

hyper_cgi/src/hyper_cgi.rs

@@ -1,6 +1,6 @@
 //! This module implements a do_cgi function, to run CGI scripts with hyper
-use futures::stream::StreamExt;
 use futures::TryStreamExt;
+use futures::stream::StreamExt;
 use hyper::{Request, Response};
 use std::process::Stdio;
 use std::str::FromStr;
@@ -25,7 +25,7 @@ pub async fn do_cgi(
             return (
                 error_response(),
                 std::vec::Vec::from("Unable to spawn child command"),
-            )
+            );
         }
     };
     let stdin = match child.stdin.take() {
@@ -34,7 +34,7 @@ pub async fn do_cgi(
             return (
                 error_response(),
                 std::vec::Vec::from("Unable to open stdin"),
-            )
+            );
         }
     };
     let stdout = match child.stdout.take() {
@@ -43,7 +43,7 @@ pub async fn do_cgi(
             return (
                 error_response(),
                 std::vec::Vec::from("Unable to open stdout"),
-            )
+            );
         }
     };
     let stderr = match child.stderr.take() {
@@ -52,7 +52,7 @@ pub async fn do_cgi(
             return (
                 error_response(),
                 std::vec::Vec::from("Unable to open stderr"),
-            )
+            );
         }
     };
 

josh-core/Cargo.toml

@@ -7,7 +7,7 @@ license-file = "LICENSE"
 description = "GIT virtualization proxy"
 keywords = ["git", "monorepo", "workflow", "scm"]
 readme = "README.md"
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 backtrace = "0.3.74"

josh-core/src/filter/mod.rs

@@ -653,7 +653,7 @@ fn apply_to_commit2(
                 },
                 true,
             ))
-            .transpose()
+            .transpose();
         }
         Op::Join(refs) => {
             // First loop to populate missing list

josh-core/src/history.rs

@@ -491,7 +491,7 @@ pub fn unapply_filter(
                     commit_message,
                     module_commit.id(),
                     msg
-                )))
+                )));
             }
         };
 
@@ -627,7 +627,7 @@ pub fn unapply_filter(
         {
             original_parents[0].id()
         } else {
-            if let Some(ref mut change_ids) = change_ids {
+            if let Some(change_ids) = change_ids {
                 change_ids.push(get_change_id(&module_commit, ret));
             }
             ret

josh-core/src/housekeeping.rs

@@ -2,7 +2,7 @@ use crate::*;
 use itertools::Itertools;
 use std::collections::{BTreeSet, HashMap};
 use std::path::Path;
-use tracing::{info, span, Level};
+use tracing::{Level, info, span};
 
 pub type KnownViews = HashMap<String, (git2::Oid, BTreeSet<String>)>;
 

josh-core/src/lib.rs

@@ -3,22 +3,14 @@
 #[macro_export]
 macro_rules! some_or {
     ($e:expr, $b:block) => {
-        if let Some(x) = $e {
-            x
-        } else {
-            $b
-        }
+        if let Some(x) = $e { x } else { $b }
     };
 }
 
 #[macro_export]
 macro_rules! ok_or {
     ($e:expr, $b:block) => {
-        if let Ok(x) = $e {
-            x
-        } else {
-            $b
-        }
+        if let Ok(x) = $e { x } else { $b }
     };
 }
 

josh-filter/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 authors = ["Christian Schilling <christian.schilling@esrlabs.com>"]
 description = "GIT filter cli"
-edition = "2021"
+edition = "2024"
 keywords = ["git", "monorepo", "workflow", "scm"]
 license-file = "LICENSE"
 name = "josh-filter"