Upgrade to Rust 2024 edition

alexle0nte · Luni-4 · commit d388d91854a6 · 2025-04-24T13:23:41.000+02:00
diff --git a/.pre-commit-audit-config.yaml b/.pre-commit-audit-config.yaml
@@ -7,10 +7,7 @@ repos:
         name: audit
         language: system
         files: 'Cargo\.lock|Cargo\.toml$'
-        # FIXME
-        # RUSTSEC-2021-0131 --> https://rustsec.org/advisories/RUSTSEC-2021-0131
-        # RUSTSEC-2021-0124 --> https://rustsec.org/advisories/RUSTSEC-2021-0124
-        entry: cargo audit --ignore RUSTSEC-2021-0131 --ignore RUSTSEC-2021-0124
+        entry: cargo audit
         pass_filenames: false
 
 default_language_version:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,12 +14,13 @@ repos:
       - id: taskcluster_yml
 -   repo: local
     hooks:
-      - id: fmt
-        name: fmt
-        language: system
-        files: '\.rs$'
-        exclude: '.*/templates/.*\.rs$'
-        entry: cargo fmt -- --check --verbose
+      # FIXME: Uncomment when fmt is fixed
+      # - id: fmt
+      #   name: fmt
+      #   language: system
+      #   files: '\.rs$'
+      #   exclude: '.*/templates/.*\.rs$'
+      #   entry: cargo fmt -- --check --verbose
 
       - id: clippy
         name: clippy
diff --git a/.taskcluster.yml b/.taskcluster.yml
@@ -55,6 +55,8 @@ tasks:
               python3 -m venv myenv
               . myenv/bin/activate
               pip3 install --quiet pre-commit
+              # FIXME: Remove the line below when fmt is fixed in .pre-commit-config.yaml
+              cargo fmt -- --check --verbose
               pre-commit run -a --show-diff-on-failure
               pre-commit run --show-diff-on-failure -c .pre-commit-audit-config.yaml
               cargo test --workspace --verbose --all-features --no-fail-fast -- --nocapture
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rust-code-analysis"
 version = "0.0.25"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/mozilla/rust-code-analysis"
 documentation = "https://docs.rs/rust-code-analysis/"
 readme = "README.md"
diff --git a/enums/Cargo.toml b/enums/Cargo.toml
@@ -2,7 +2,7 @@
 name = "enums"
 version = "0.0.1"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
-edition = "2021"
+edition = "2024"
 
 [dependencies]
 clap = { version = "^4.0", features = ["derive"] }
diff --git a/rust-code-analysis-cli/Cargo.toml b/rust-code-analysis-cli/Cargo.toml
@@ -3,7 +3,7 @@ name = "rust-code-analysis-cli"
 version = "0.0.25"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
 repository = "https://github.com/mozilla/rust-code-analysis/blob/master/rust-code-analysis-cli/"
-edition = "2021"
+edition = "2024"
 keywords = ["metrics"]
 description = "Tool to compute and export code metrics"
 license = "MPL-2.0"
diff --git a/rust-code-analysis-cli/src/formats.rs b/rust-code-analysis-cli/src/formats.rs
@@ -1,4 +1,4 @@
-use std::fs::{create_dir_all, File};
+use std::fs::{File, create_dir_all};
 use std::io::Write;
 use std::path::{Path, PathBuf};
 use std::str::FromStr;
@@ -94,11 +94,7 @@ fn handle_path(path: PathBuf, output_path: &Path, extension: &str) -> PathBuf {
         .iter()
         .map(|os_str| {
             let s_str = os_str.to_str().unwrap();
-            if s_str == ".." {
-                "."
-            } else {
-                s_str
-            }
+            if s_str == ".." { "." } else { s_str }
         })
         .collect();
 
diff --git a/rust-code-analysis-cli/src/main.rs b/rust-code-analysis-cli/src/main.rs
@@ -1,14 +1,14 @@
 mod formats;
 
 use std::cmp::Ordering;
-use std::collections::{hash_map, HashMap};
+use std::collections::{HashMap, hash_map};
 use std::path::{Path, PathBuf};
 use std::process;
 use std::sync::{Arc, Mutex};
 use std::thread::available_parallelism;
 
-use clap::builder::{PossibleValuesParser, TypedValueParser};
 use clap::Parser;
+use clap::builder::{PossibleValuesParser, TypedValueParser};
 use globset::{Glob, GlobSet, GlobSetBuilder};
 
 use formats::Format;
diff --git a/rust-code-analysis-web/Cargo.toml b/rust-code-analysis-web/Cargo.toml
@@ -2,7 +2,7 @@
 name = "rust-code-analysis-web"
 version = "0.0.25"
 authors = ["Calixte Denizet <cdenizet@mozilla.com>"]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/mozilla/rust-code-analysis/tree/master/rust-code-analysis-web"
 keywords = ["metrics"]
 description = "Run a web service to compute and export code metrics"
diff --git a/rust-code-analysis-web/src/web/comment.rs b/rust-code-analysis-web/src/web/comment.rs
@@ -1,6 +1,6 @@
 use serde::{Deserialize, Serialize};
 
-use rust_code_analysis::{rm_comments, Callback, ParserTrait};
+use rust_code_analysis::{Callback, ParserTrait, rm_comments};
 
 /// Payload containing source code with comments to be removed.
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/rust-code-analysis-web/src/web/function.rs b/rust-code-analysis-web/src/web/function.rs
@@ -1,7 +1,7 @@
 use serde::{Deserialize, Serialize};
 use serde_json::{self, Value};
 
-use rust_code_analysis::{function, Callback, FunctionSpan, ParserTrait};
+use rust_code_analysis::{Callback, FunctionSpan, ParserTrait, function};
 
 /// Payload containing source code with function spans to be retrieved.
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/rust-code-analysis-web/src/web/metrics.rs b/rust-code-analysis-web/src/web/metrics.rs
@@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize};
 use serde_json::{self, Value};
 use std::path::PathBuf;
 
-use rust_code_analysis::{metrics, Callback, FuncSpace, ParserTrait};
+use rust_code_analysis::{Callback, FuncSpace, ParserTrait, metrics};
 
 /// Payload containing source code used to compute metrics.
 #[derive(Debug, Deserialize, Serialize)]
diff --git a/rust-code-analysis-web/src/web/server.rs b/rust-code-analysis-web/src/web/server.rs
@@ -1,7 +1,6 @@
 use actix_web::{
-    guard, http,
+    App, HttpRequest, HttpResponse, HttpServer, guard, http,
     web::{self, BytesMut, Query},
-    App, HttpRequest, HttpResponse, HttpServer,
 };
 use futures::StreamExt;
 use serde::{Deserialize, Serialize};
@@ -11,7 +10,7 @@ use super::comment::{WebCommentCallback, WebCommentCfg, WebCommentInfo, WebComme
 use super::function::{WebFunctionCallback, WebFunctionCfg, WebFunctionInfo, WebFunctionPayload};
 use super::metrics::{WebMetricsCallback, WebMetricsCfg, WebMetricsInfo, WebMetricsPayload};
 
-use rust_code_analysis::{action, guess_language, AstCallback, AstCfg, AstPayload, LANG};
+use rust_code_analysis::{AstCallback, AstCfg, AstPayload, LANG, action, guess_language};
 
 const INVALID_LANGUAGE: &str = "The file extension doesn't correspond to a valid language";
 
@@ -300,7 +299,7 @@ pub async fn run(host: &str, port: u16, n_threads: usize) -> std::io::Result<()>
 #[cfg(test)]
 mod tests {
     use actix_web::web::Bytes;
-    use actix_web::{http::header::ContentType, http::StatusCode, test};
+    use actix_web::{http::StatusCode, http::header::ContentType, test};
     use pretty_assertions::assert_eq;
     use serde_json::json;
     use serde_json::value::Value;
diff --git a/src/c_langs_macros/mod.rs b/src/c_langs_macros/mod.rs
@@ -51,7 +51,9 @@ mod tests {
 
     #[test]
     fn test_fn_qm_try_inspect_cpp() {
-        let samples = vec!["QM_TRY_INSPECT(const int32_t& storageVersion, MOZ_TO_RESULT_INVOKE(aConnection, GetSchemaVersion));"];
+        let samples = vec![
+            "QM_TRY_INSPECT(const int32_t& storageVersion, MOZ_TO_RESULT_INVOKE(aConnection, GetSchemaVersion));",
+        ];
         parse(&samples, false);
     }
 }
diff --git a/src/concurrent_files.rs b/src/concurrent_files.rs
@@ -3,7 +3,7 @@ use std::path::{Path, PathBuf};
 use std::sync::Arc;
 use std::thread;
 
-use crossbeam::channel::{unbounded, Receiver, Sender};
+use crossbeam::channel::{Receiver, Sender, unbounded};
 use globset::GlobSet;
 use walkdir::{DirEntry, WalkDir};
 
@@ -256,7 +256,7 @@ impl<Config: 'static + Send + Sync> ConcurrentRunner<Config> {
             Err(_) => {
                 return Err(ConcurrentErrors::Producer(
                     "Child thread panicked".to_owned(),
-                ))
+                ));
             }
         };
 
diff --git a/src/metrics/abc.rs b/src/metrics/abc.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/cognitive.rs b/src/metrics/cognitive.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/cyclomatic.rs b/src/metrics/cyclomatic.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/exit.rs b/src/metrics/exit.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/halstead.rs b/src/metrics/halstead.rs
@@ -1,7 +1,7 @@
 use std::collections::HashMap;
 
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/loc.rs b/src/metrics/loc.rs
@@ -1,8 +1,8 @@
 use std::collections::HashSet;
 
 use crate::checker::Checker;
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::macros::implement_metric_trait;
diff --git a/src/metrics/mi.rs b/src/metrics/mi.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use super::cyclomatic;
diff --git a/src/metrics/nargs.rs b/src/metrics/nargs.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/nom.rs b/src/metrics/nom.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/npa.rs b/src/metrics/npa.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/npm.rs b/src/metrics/npm.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/metrics/wmc.rs b/src/metrics/wmc.rs
@@ -1,5 +1,5 @@
-use serde::ser::{SerializeStruct, Serializer};
 use serde::Serialize;
+use serde::ser::{SerializeStruct, Serializer};
 use std::fmt;
 
 use crate::checker::Checker;
diff --git a/src/node.rs b/src/node.rs
@@ -83,9 +83,11 @@ impl<'a> Node<'a> {
     #[inline(always)]
     pub(crate) fn has_sibling(&self, id: u16) -> bool {
         self.0.parent().is_some_and(|parent| {
-            self.0
+            let has_child = self
+                .0
                 .children(&mut parent.walk())
-                .any(|child| child.kind_id() == id)
+                .any(|child| child.kind_id() == id);
+            has_child
         })
     }
 
@@ -99,9 +101,11 @@ impl<'a> Node<'a> {
 
     #[inline(always)]
     pub(crate) fn is_child(&self, id: u16) -> bool {
-        self.0
+        let is_child = self
+            .0
             .children(&mut self.0.walk())
-            .any(|child| child.kind_id() == id)
+            .any(|child| child.kind_id() == id);
+        is_child
     }
 
     pub(crate) fn child_count(&self) -> usize {
@@ -116,7 +120,7 @@ impl<'a> Node<'a> {
         self.0.child(pos).map(Node)
     }
 
-    pub(crate) fn children(&self) -> impl ExactSizeIterator<Item = Node<'a>> {
+    pub(crate) fn children(&self) -> impl ExactSizeIterator<Item = Node<'a>> + use<'a> {
         let mut cursor = self.cursor();
         cursor.goto_first_child();
         (0..self.child_count()).map(move |_| {
diff --git a/src/ops.rs b/src/ops.rs
@@ -250,7 +250,7 @@ impl Callback for OpsCode {
 mod tests {
     use std::path::PathBuf;
 
-    use crate::{get_ops, LANG};
+    use crate::{LANG, get_ops};
 
     #[inline(always)]
     fn check_ops(
diff --git a/src/parser.rs b/src/parser.rs
@@ -22,7 +22,7 @@ use crate::getter::Getter;
 use crate::c_macro;
 use crate::langs::*;
 use crate::node::{Node, Tree};
-use crate::preproc::{get_macros, PreprocResults};
+use crate::preproc::{PreprocResults, get_macros};
 use crate::traits::*;
 
 #[derive(Debug)]
@@ -95,24 +95,24 @@ fn get_fake_code<T: LanguageInfo>(
 }
 
 impl<
-        T: 'static
-            + LanguageInfo
-            + Alterator
-            + Checker
-            + Getter
-            + Abc
-            + Cognitive
-            + Cyclomatic
-            + Exit
-            + Halstead
-            + Loc
-            + Mi
-            + NArgs
-            + Nom
-            + Npa
-            + Npm
-            + Wmc,
-    > ParserTrait for Parser<T>
+    T: 'static
+        + LanguageInfo
+        + Alterator
+        + Checker
+        + Getter
+        + Abc
+        + Cognitive
+        + Cyclomatic
+        + Exit
+        + Halstead
+        + Loc
+        + Mi
+        + NArgs
+        + Nom
+        + Npa
+        + Npm
+        + Wmc,
+> ParserTrait for Parser<T>
 {
     type Checker = T;
     type Getter = T;
diff --git a/src/preproc.rs b/src/preproc.rs
@@ -1,8 +1,8 @@
-use std::collections::{hash_map, HashMap, HashSet};
+use std::collections::{HashMap, HashSet, hash_map};
 use std::path::{Path, PathBuf};
 
 use petgraph::{
-    algo::kosaraju_scc, graph::NodeIndex, stable_graph::StableGraph, visit::Dfs, Direction,
+    Direction, algo::kosaraju_scc, graph::NodeIndex, stable_graph::StableGraph, visit::Dfs,
 };
 use serde::{Deserialize, Serialize};
 
diff --git a/src/spaces.rs b/src/spaces.rs
