chore: upgrade rust to 1.81.0 nightly (#8111)

* chore: upgrade rust to 1.81.0 nightly

* fix: update asset size to usize

Author: jerrykingxyz

.github/workflows/ci.yml

@@ -267,7 +267,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: clippy
-          args: --workspace --all-targets -- -D warnings
+          args: --workspace --all-targets --tests -- -D warnings
 
       - name: Run rustfmt
         uses: actions-rs/cargo@v1

crates/rspack_binding_values/src/stats.rs

@@ -991,7 +991,7 @@ impl From<rspack_core::StatsChunkGroupAsset> for JsStatsChunkGroupAsset {
   fn from(stats: rspack_core::StatsChunkGroupAsset) -> Self {
     Self {
       name: stats.name,
-      size: stats.size,
+      size: stats.size as f64,
     }
   }
 }
@@ -1024,11 +1024,11 @@ impl From<rspack_core::StatsChunkGroup> for JsStatsChunkGroup {
       name: stats.name,
       chunks: stats.chunks,
       assets: stats.assets.into_iter().map(Into::into).collect(),
-      assets_size: stats.assets_size,
+      assets_size: stats.assets_size as f64,
       auxiliary_assets: stats
         .auxiliary_assets
         .map(|assets| assets.into_iter().map(Into::into).collect()),
-      auxiliary_assets_size: stats.auxiliary_assets_size,
+      auxiliary_assets_size: stats.auxiliary_assets_size.map(|inner| inner as f64),
       children: stats.children.map(|i| i.into()),
       child_assets: stats.child_assets.map(|i| i.into()),
       is_over_size_limit: stats.is_over_size_limit,

crates/rspack_core/src/diagnostics.rs

@@ -78,6 +78,7 @@ impl miette::Diagnostic for ModuleBuildError {
 }
 
 /// Represent any errors or warnings during module parse
+///
 /// This does NOT aligned with webpack as webpack does not have parse warning.
 /// However, rspack may create warning during parsing stage, taking CSS as an example.
 #[derive(Debug, Error)]

crates/rspack_core/src/options/filename.rs

@@ -117,10 +117,9 @@ impl LocalFilenameFn for NoFilenameFn {
 
 impl From<FilenameTemplate> for Filename {
   fn from(value: FilenameTemplate) -> Self {
-    Self(match value.0 {
-      FilenameKind::Template(template) => FilenameKind::Template(template),
-      FilenameKind::Fn(no_fn) => match no_fn.0 {},
-    })
+    let FilenameKind::Template(template) = value.0;
+
+    Self(FilenameKind::Template(template))
   }
 }
 

crates/rspack_core/src/stats/struct.rs

@@ -220,17 +220,17 @@ pub struct StatsChunk<'a> {
 #[derive(Debug)]
 pub struct StatsChunkGroupAsset {
   pub name: String,
-  pub size: f64,
+  pub size: usize,
 }
 
 #[derive(Debug)]
 pub struct StatsChunkGroup {
   pub name: String,
   pub chunks: Vec<String>,
   pub assets: Vec<StatsChunkGroupAsset>,
-  pub assets_size: f64,
+  pub assets_size: usize,
   pub auxiliary_assets: Option<Vec<StatsChunkGroupAsset>>,
-  pub auxiliary_assets_size: Option<f64>,
+  pub auxiliary_assets_size: Option<usize>,
   pub children: Option<StatsChunkGroupChildren>,
   pub is_over_size_limit: Option<bool>,
   pub child_assets: Option<StatschunkGroupChildAssets>,

crates/rspack_core/src/stats/utils.rs

@@ -11,12 +11,12 @@ use crate::{
   ChunkGroupByUkey, ChunkGroupOrderKey, ChunkGroupUkey, Compilation, CompilerOptions, ModuleGraph,
 };
 
-pub fn get_asset_size(file: &str, compilation: &Compilation) -> f64 {
+pub fn get_asset_size(file: &str, compilation: &Compilation) -> usize {
   compilation
     .assets()
     .get(file)
-    .and_then(|asset| asset.get_source().map(|s| s.size() as f64))
-    .unwrap_or(-1f64)
+    .and_then(|asset| asset.get_source().map(|s| s.size()))
+    .unwrap_or(0)
 }
 
 pub fn sort_modules(modules: &mut [StatsModule]) {

crates/rspack_regex/src/algo.rs

@@ -112,24 +112,6 @@ impl Algo {
   }
 }
 
-#[cfg(test)]
-impl Algo {
-  fn end_with_pats(&self) -> std::collections::HashSet<&str> {
-    match self {
-      Algo::EndWith { pats } => pats.iter().map(|s| s.as_str()).collect(),
-      Algo::Regress(_) => panic!("expect EndWith"),
-    }
-  }
-
-  fn is_end_with(&self) -> bool {
-    matches!(self, Self::EndWith { .. })
-  }
-
-  fn is_regress(&self) -> bool {
-    matches!(self, Self::Regress(..))
-  }
-}
-
 fn is_ends_with_regex(hir: &Hir) -> bool {
   if let HirKind::Concat(list) = hir.kind() {
     list[0].kind() != &HirKind::Look(Look::Start)
@@ -143,6 +125,23 @@ fn is_ends_with_regex(hir: &Hir) -> bool {
 mod test_algo {
   use super::*;
 
+  impl Algo {
+    fn end_with_pats(&self) -> std::collections::HashSet<&str> {
+      match self {
+        Algo::EndWith { pats } => pats.iter().map(|s| s.as_str()).collect(),
+        Algo::Regress(_) => panic!("expect EndWith"),
+      }
+    }
+
+    fn is_end_with(&self) -> bool {
+      matches!(self, Self::EndWith { .. })
+    }
+
+    fn is_regress(&self) -> bool {
+      matches!(self, Self::Regress(..))
+    }
+  }
+
   #[test]
   fn should_use_end_with_algo_with_i_flag() {
     assert!(Algo::new("\\.js$", "").unwrap().is_end_with());

crates/rspack_util/src/infallible.rs

@@ -8,9 +8,7 @@ pub trait ResultInfallibleExt {
 impl<T> ResultInfallibleExt for Result<T, Infallible> {
   type Ok = T;
   fn always_ok(self) -> T {
-    match self {
-      Ok(ok) => ok,
-      Err(infallible) => match infallible {},
-    }
+    let Ok(ok) = self;
+    ok
   }
 }

rust-toolchain.toml

@@ -2,4 +2,4 @@
 profile = "default"
 # Use nightly for better access to the latest Rust features.
 # This date is aligned to stable release dates.
-channel = "nightly-2024-06-07" # v1.80.0
+channel = "nightly-2024-09-05" # v1.81.0