chore: update to edition 2024 and rust 1.90.0

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "deno_graph"
 version = "0.103.1"
-edition = "2021"
+edition = "2024"
 description = "Module graph analysis for deno"
 homepage = "https://deno.land/"
 repository = "https://github.com/denoland/deno_graph"
@@ -49,7 +49,11 @@ chrono = { version = "0.4.42", default-features = false, features = ["serde"] }
 data-url = "0.3.0"
 # this is optional in order to support using parsers other than swc
 deno_ast = { version = "0.50.0", features = ["emit"], optional = true }
-deno_media_type = { version = "0.2.9", features = ["decoding", "data_url", "module_specifier"] }
+deno_media_type = { version = "0.2.9", features = [
+  "decoding",
+  "data_url",
+  "module_specifier",
+] }
 deno_unsync.workspace = true
 deno_path_util = "0.6.0"
 deno_semver = "0.9.0"
@@ -78,7 +82,11 @@ deno_unsync = { workspace = true, features = ["tokio"] }
 bincode = "1.3.3"
 file_test_runner = "0.7.0"
 pretty_assertions = "1.0.0"
-reqwest = { version = "0.12.4", default-features = false, features = ["http2", "charset", "rustls-tls-webpki-roots"] }
+reqwest = { version = "0.12.4", default-features = false, features = [
+  "http2",
+  "charset",
+  "rustls-tls-webpki-roots",
+] }
 tempfile = "3.4.0"
 tokio = { version = "1.10.1", features = ["macros", "rt-multi-thread", "sync"] }
 deno_terminal = "0.2.0"

rust-toolchain.toml

@@ -1,3 +1,3 @@
 [toolchain]
-channel = "1.89.0"
+channel = "1.90.0"
 components = [ "clippy", "rustfmt" ]

src/analysis.rs

@@ -10,10 +10,10 @@ use regex::Regex;
 use serde::Deserialize;
 use serde::Serialize;
 
+use crate::ModuleSpecifier;
 use crate::graph::Position;
 use crate::graph::PositionRange;
 use crate::source::ResolutionMode;
-use crate::ModuleSpecifier;
 
 #[derive(Clone, Debug, Eq, PartialEq, Serialize, Deserialize)]
 #[serde(rename_all = "camelCase", tag = "type")]
@@ -328,31 +328,29 @@ pub fn module_graph_1_to_2(module_info: &mut serde_json::Value) {
   // To support older module graphs, we need to convert the module graph 1
   // to the new format. To do this, we need to extract the types specifier
   // from the leading comments and add it to the dependency object.
-  if let serde_json::Value::Object(module_info) = module_info {
-    if let Some(dependencies) = module_info
+  if let serde_json::Value::Object(module_info) = module_info
+    && let Some(dependencies) = module_info
       .get_mut("dependencies")
       .and_then(|v| v.as_array_mut())
-    {
-      for dependency in dependencies {
-        if let Some(dependency) = dependency.as_object_mut() {
-          if let Some(leading_comments) = dependency
-            .get("leadingComments")
-            .and_then(|v| v.as_array())
-            .and_then(|v| {
-              v.iter()
-                .map(|v| serde_json::from_value(v.clone()).ok())
-                .collect::<Option<Vec<Comment>>>()
-            })
-          {
-            if let Some(deno_types) = analyze_deno_types(&leading_comments) {
-              dependency.insert(
-                "typesSpecifier".to_string(),
-                serde_json::to_value(deno_types).unwrap(),
-              );
-            }
-            dependency.remove("leadingComments");
-          }
+  {
+    for dependency in dependencies {
+      if let Some(dependency) = dependency.as_object_mut()
+        && let Some(leading_comments) = dependency
+          .get("leadingComments")
+          .and_then(|v| v.as_array())
+          .and_then(|v| {
+            v.iter()
+              .map(|v| serde_json::from_value(v.clone()).ok())
+              .collect::<Option<Vec<Comment>>>()
+          })
+      {
+        if let Some(deno_types) = analyze_deno_types(&leading_comments) {
+          dependency.insert(
+            "typesSpecifier".to_string(),
+            serde_json::to_value(deno_types).unwrap(),
+          );
         }
+        dependency.remove("leadingComments");
       }
     }
   };

src/ast/dep.rs

@@ -1,17 +1,17 @@
 use std::collections::HashMap;
 
+use deno_ast::MultiThreadedComments;
+use deno_ast::ProgramRef;
+use deno_ast::SourcePos;
+use deno_ast::SourceRange;
+use deno_ast::SourceRangedForSpanned;
 use deno_ast::swc::ast;
 use deno_ast::swc::ast::Callee;
 use deno_ast::swc::ast::Expr;
 use deno_ast::swc::atoms::Atom;
 use deno_ast::swc::common::comments::CommentKind;
 use deno_ast::swc::ecma_visit::Visit;
 use deno_ast::swc::ecma_visit::VisitWith;
-use deno_ast::MultiThreadedComments;
-use deno_ast::ProgramRef;
-use deno_ast::SourcePos;
-use deno_ast::SourceRange;
-use deno_ast::SourceRangedForSpanned;
 
 use crate::analysis::DynamicDependencyKind;
 use crate::analysis::ImportAttribute;
@@ -408,20 +408,20 @@ fn parse_import_attributes(
   };
   let mut import_attributes = HashMap::new();
   for prop in attrs.props.iter() {
-    if let ast::PropOrSpread::Prop(prop) = prop {
-      if let ast::Prop::KeyValue(key_value) = &**prop {
-        let maybe_key = match &key_value.key {
-          ast::PropName::Str(key) => Some(key.value.to_string()),
-          ast::PropName::Ident(ident) => Some(ident.sym.to_string()),
-          _ => None,
-        };
+    if let ast::PropOrSpread::Prop(prop) = prop
+      && let ast::Prop::KeyValue(key_value) = &**prop
+    {
+      let maybe_key = match &key_value.key {
+        ast::PropName::Str(key) => Some(key.value.to_string()),
+        ast::PropName::Ident(ident) => Some(ident.sym.to_string()),
+        _ => None,
+      };
 
-        if let Some(key) = maybe_key {
-          if let ast::Expr::Lit(ast::Lit::Str(str_)) = &*key_value.value {
-            import_attributes
-              .insert(key, ImportAttribute::Known(str_.value.to_string()));
-          }
-        }
+      if let Some(key) = maybe_key
+        && let ast::Expr::Lit(ast::Lit::Str(str_)) = &*key_value.value
+      {
+        import_attributes
+          .insert(key, ImportAttribute::Known(str_.value.to_string()));
       }
     }
   }
@@ -524,11 +524,11 @@ fn parse_import_attributes_from_object_lit(
 #[cfg(test)]
 mod tests {
   use crate::ModuleSpecifier;
-  use deno_ast::swc::atoms::Atom;
-  use deno_ast::swc::common::comments::CommentKind;
   use deno_ast::SourcePos;
   use deno_ast::SourceRange;
   use deno_ast::SourceRangedForSpanned;
+  use deno_ast::swc::atoms::Atom;
+  use deno_ast::swc::common::comments::CommentKind;
 
   use pretty_assertions::assert_eq;
 

src/ast/mod.rs

@@ -1,14 +1,5 @@
 // Copyright 2018-2024 the Deno authors. MIT license.
 
-use crate::analysis::find_deno_types;
-use crate::analysis::find_jsx_import_source;
-use crate::analysis::find_jsx_import_source_types;
-use crate::analysis::find_path_reference;
-use crate::analysis::find_resolution_mode;
-use crate::analysis::find_ts_self_types;
-use crate::analysis::find_ts_types;
-use crate::analysis::find_types_reference;
-use crate::analysis::is_comment_triple_slash_reference;
 use crate::analysis::DependencyDescriptor;
 use crate::analysis::DynamicArgument;
 use crate::analysis::DynamicDependencyDescriptor;
@@ -20,6 +11,15 @@ use crate::analysis::SpecifierWithRange;
 use crate::analysis::StaticDependencyDescriptor;
 use crate::analysis::TypeScriptReference;
 use crate::analysis::TypeScriptTypesResolutionMode;
+use crate::analysis::find_deno_types;
+use crate::analysis::find_jsx_import_source;
+use crate::analysis::find_jsx_import_source_types;
+use crate::analysis::find_path_reference;
+use crate::analysis::find_resolution_mode;
+use crate::analysis::find_ts_self_types;
+use crate::analysis::find_ts_types;
+use crate::analysis::find_types_reference;
+use crate::analysis::is_comment_triple_slash_reference;
 use crate::graph::Position;
 use crate::graph::PositionRange;
 use crate::module_specifier::ModuleSpecifier;
@@ -30,18 +30,18 @@ use deno_ast::SourcePos;
 use deno_ast::SourceRanged;
 use deno_ast::SourceRangedForSpanned;
 
-use deno_ast::swc::common::comments::CommentKind;
 use deno_ast::MediaType;
 use deno_ast::ParseDiagnostic;
 use deno_ast::ParsedSource;
 use deno_ast::SourceTextInfo;
+use deno_ast::swc::common::comments::CommentKind;
 use deno_error::JsErrorBox;
 use std::cell::RefCell;
 use std::collections::HashMap;
 use std::sync::Arc;
 
-use self::dep::analyze_program_dependencies;
 use self::dep::DependencyComment;
+use self::dep::analyze_program_dependencies;
 
 mod dep;
 
@@ -200,17 +200,18 @@ impl EsParser for CapturingEsParser<'_> {
     &self,
     options: ParseOptions,
   ) -> Result<ParsedSource, ParseDiagnostic> {
-    if let Some(parsed_source) = self.get_from_store_if_matches(&options) {
-      Ok(parsed_source)
-    } else {
-      let default_parser = DefaultEsParser;
-      let parser = self.parser.unwrap_or(&default_parser);
-      let specifier = options.specifier.clone();
-      let parsed_source = parser.parse_program(options)?;
-      self
-        .store
-        .set_parsed_source(specifier, parsed_source.clone());
-      Ok(parsed_source)
+    match self.get_from_store_if_matches(&options) {
+      Some(parsed_source) => Ok(parsed_source),
+      _ => {
+        let default_parser = DefaultEsParser;
+        let parser = self.parser.unwrap_or(&default_parser);
+        let specifier = options.specifier.clone();
+        let parsed_source = parser.parse_program(options)?;
+        self
+          .store
+          .set_parsed_source(specifier, parsed_source.clone());
+        Ok(parsed_source)
+      }
     }
   }
 }
@@ -1019,11 +1020,13 @@ mod tests {
       r#"https://deno.land/x/types/react/index.d.ts"#
     );
 
-    assert!(dependencies[6]
-      .as_static()
-      .unwrap()
-      .types_specifier
-      .is_none());
+    assert!(
+      dependencies[6]
+        .as_static()
+        .unwrap()
+        .types_specifier
+        .is_none()
+    );
 
     let dep_deno_types = &dependencies[8]
       .as_dynamic()
@@ -1475,10 +1478,12 @@ export {};
       parse_jsdoc_import_decl("@import { SomeType } from \"./a.ts\"").is_ok()
     );
     // quotes in named imports
-    assert!(parse_jsdoc_import_decl(
-      "@import { SomeType, \"test\" as test, 'b' as test2 } from \"./a.ts\""
-    )
-    .is_ok());
+    assert!(
+      parse_jsdoc_import_decl(
+        "@import { SomeType, \"test\" as test, 'b' as test2 } from \"./a.ts\""
+      )
+      .is_ok()
+    );
     // single quotes and namespace import
     assert!(parse_jsdoc_import_decl("@import * as test from './a.ts'").is_ok());
     // missing space certain tokens
@@ -1489,7 +1494,9 @@ export {};
     assert!(parse_jsdoc_import_decl("@import test from \"./a.ts'").is_err());
     assert!(parse_jsdoc_import_decl("@import test from './a.ts\"").is_err());
     assert_eq!(
-      parse_resolution_mode("@import { SomeType } from \"./a.ts\" with { 'resolution-mode': 'import' }"),
+      parse_resolution_mode(
+        "@import { SomeType } from \"./a.ts\" with { 'resolution-mode': 'import' }"
+      ),
       Some(TypeScriptTypesResolutionMode::Import)
     );
     assert_eq!(
@@ -1499,7 +1506,9 @@ export {};
       Some(TypeScriptTypesResolutionMode::Require)
     );
     assert_eq!(
-      parse_resolution_mode("@import v from 'test' with { type: 'other', 'resolution-mode': \"require\" }"),
+      parse_resolution_mode(
+        "@import v from 'test' with { type: 'other', 'resolution-mode': \"require\" }"
+      ),
       Some(TypeScriptTypesResolutionMode::Require)
     );
   }