chore: Rust 2024 (#226)

Author: dsherret

Cargo.toml

@@ -2,7 +2,7 @@
 name = "eszip"
 version = "0.99.0"
 authors = ["the Deno authors"]
-edition = "2021"
+edition = "2024"
 repository = "https://github.com/denoland/eszip"
 description = "A utility that can download JavaScript and TypeScript module graphs and store them locally in a special zip file"
 license = "MIT"

benches/source_hash_function.rs

@@ -1,11 +1,11 @@
-use criterion::{criterion_group, criterion_main, BenchmarkId, Criterion};
+use criterion::{BenchmarkId, Criterion, criterion_group, criterion_main};
 use deno_ast::{EmitOptions, TranspileOptions};
 use deno_graph::{
+  BuildOptions, GraphKind, ModuleGraph, ModuleSpecifier,
+  ast::CapturingModuleAnalyzer,
   source::{MemoryLoader, Source},
-  BuildOptions, ast::CapturingModuleAnalyzer, GraphKind, ModuleGraph,
-  ModuleSpecifier,
 };
-use eszip::{v2::Checksum, EszipV2};
+use eszip::{EszipV2, v2::Checksum};
 use futures::io::{AllowStdIo, BufReader};
 
 #[cfg(feature = "sha256")]

rust-toolchain.toml

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

src/examples/builder.rs

@@ -6,12 +6,12 @@ use std::sync::Arc;
 use deno_ast::EmitOptions;
 use deno_ast::TranspileOptions;
 use deno_error::JsErrorBox;
-use deno_graph::source::CacheSetting;
-use deno_graph::source::ResolveError;
 use deno_graph::BuildOptions;
-use deno_graph::ast::CapturingModuleAnalyzer;
 use deno_graph::GraphKind;
 use deno_graph::ModuleGraph;
+use deno_graph::ast::CapturingModuleAnalyzer;
+use deno_graph::source::CacheSetting;
+use deno_graph::source::ResolveError;
 use import_map::ImportMap;
 use reqwest::StatusCode;
 use url::Url;

src/lib.rs

@@ -223,10 +223,10 @@ pub enum ModuleKind {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use futures::io::AllowStdIo;
-  use futures::stream;
   use futures::StreamExt;
   use futures::TryStreamExt;
+  use futures::io::AllowStdIo;
+  use futures::stream;
 
   #[tokio::test]
   async fn parse_v1() {

src/v2.rs

@@ -17,29 +17,29 @@ use deno_ast::ModuleSpecifier;
 use deno_ast::SourceMapOption;
 use deno_ast::TranspileModuleOptions;
 use deno_ast::TranspileOptions;
+use deno_graph::ModuleGraph;
 use deno_graph::ast::CapturingEsParser;
 use deno_graph::ast::EsParser;
 use deno_graph::ast::ParseOptions;
-use deno_graph::ModuleGraph;
+use deno_npm::NpmPackageId;
 use deno_npm::resolution::SerializedNpmResolutionSnapshot;
 use deno_npm::resolution::SerializedNpmResolutionSnapshotPackage;
 use deno_npm::resolution::ValidSerializedNpmResolutionSnapshot;
-use deno_npm::NpmPackageId;
+use deno_semver::StackString;
 use deno_semver::npm::NpmPackageNvReference;
 use deno_semver::package::PackageNv;
 use deno_semver::package::PackageReq;
-use deno_semver::StackString;
 use futures::future::poll_fn;
 use futures::io::AsyncReadExt;
 use hashlink::linked_hash_map::LinkedHashMap;
 use indexmap::IndexMap;
 use indexmap::IndexSet;
 pub use url::Url;
 
-use crate::error::ParseError;
 use crate::Module;
 use crate::ModuleInner;
 pub use crate::ModuleKind;
+use crate::error::ParseError;
 
 const ESZIP_V2_MAGIC: &[u8; 8] = b"ESZIP_V2";
 const ESZIP_V2_1_MAGIC: &[u8; 8] = b"ESZIP2.1";
@@ -122,7 +122,7 @@ impl EszipV2Modules {
       let mut modules = self.0.lock().unwrap();
       let module = modules.get_mut(specifier).unwrap();
       let slot = match module {
-        EszipV2Module::Module { ref mut source, .. } => source,
+        EszipV2Module::Module { source, .. } => source,
         EszipV2Module::Redirect { .. } => {
           panic!("redirects are already resolved")
         }
@@ -946,7 +946,7 @@ impl EszipV2 {
           let mut modules = modules.lock().unwrap();
           let module = modules.get_mut(&specifier).expect("module not found");
           match module {
-            EszipV2Module::Module { ref mut source, .. } => {
+            EszipV2Module::Module { source, .. } => {
               let slot = std::mem::replace(
                 source,
                 EszipV2SourceSlot::Ready(Arc::from(
@@ -986,9 +986,7 @@ impl EszipV2 {
           let mut modules = modules.lock().unwrap();
           let module = modules.get_mut(&specifier).expect("module not found");
           match module {
-            EszipV2Module::Module {
-              ref mut source_map, ..
-            } => {
+            EszipV2Module::Module { source_map, .. } => {
               let slot = std::mem::replace(
                 source_map,
                 EszipV2SourceSlot::Ready(Arc::from(
@@ -1698,7 +1696,7 @@ impl EszipV2 {
             inner: ModuleInner::V2(self.modules.clone()),
           });
         }
-        EszipV2Module::Redirect { ref target } => {
+        EszipV2Module::Redirect { target } => {
           specifier = target;
           if visited.contains(specifier) {
             return None;
@@ -1985,20 +1983,20 @@ mod tests {
   use deno_ast::EmitOptions;
   use deno_ast::TranspileOptions;
   use deno_error::JsErrorBox;
+  use deno_graph::BuildOptions;
+  use deno_graph::GraphKind;
+  use deno_graph::ModuleGraph;
+  use deno_graph::ModuleSpecifier;
   use deno_graph::ast::CapturingModuleAnalyzer;
   use deno_graph::source::CacheSetting;
   use deno_graph::source::LoadOptions;
   use deno_graph::source::LoadResponse;
   use deno_graph::source::MemoryLoader;
   use deno_graph::source::ResolveError;
   use deno_graph::source::Source;
-  use deno_graph::BuildOptions;
-  use deno_graph::GraphKind;
-  use deno_graph::ModuleGraph;
-  use deno_graph::ModuleSpecifier;
+  use deno_npm::NpmPackageId;
   use deno_npm::resolution::SerializedNpmResolutionSnapshot;
   use deno_npm::resolution::SerializedNpmResolutionSnapshotPackage;
-  use deno_npm::NpmPackageId;
   use deno_semver::npm::NpmPackageNvReference;
   use deno_semver::package::PackageNv;
   use deno_semver::package::PackageReq;
@@ -2009,10 +2007,10 @@ mod tests {
   use url::Url;
 
   use super::Checksum;
-  use super::EszipV2;
   use super::ESZIP_V2_2_MAGIC;
-  use crate::v2::FromGraphNpmPackages;
+  use super::EszipV2;
   use crate::ModuleKind;
+  use crate::v2::FromGraphNpmPackages;
 
   struct FileLoader {
     base_dir: String,