chore: fix conclict

web-infra-dev · Aug 21, 2024 · 957b874 · 957b874
1 parent b6057ad
commit 957b874
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/crates/rspack_core/src/compiler/mod.rs b/crates/rspack_core/src/compiler/mod.rs
@@ -313,8 +313,7 @@ where
     if let Some(source) = asset.get_source() {
       let filename = filename
         .split_once('?')
-        .map(|(filename, _query)| filename)
-        .unwrap_or(filename);
+        .map_or(filename, |(filename, _query)| filename);
       let file_path = output_path.join(filename);
       self
         .output_filesystem

diff --git a/crates/rspack_core/src/normal_module_factory.rs b/crates/rspack_core/src/normal_module_factory.rs
@@ -313,7 +313,7 @@ impl NormalModuleFactory {
     } else {
       // resource without scheme and without path
       if resource.is_empty() || resource.starts_with(QUESTION_MARK) {
-        ResourceData::new(resource.to_owned()).path(Utf8PathBuf::from(""))
+        ResourceData::new(resource.clone()).path(Utf8PathBuf::from(""))
       } else {
         // resource without scheme and with path
         let resolve_args = ResolveArgs {

diff --git a/crates/rspack_core/src/options/output.rs b/crates/rspack_core/src/options/output.rs
@@ -317,7 +317,7 @@ impl PublicPath {
 
   pub fn render_auto_public_path(compilation: &Compilation, filename: &str) -> String {
     let public_path = match Utf8Path::new(filename).parent() {
-      None => "".to_string(),
+      None => String::new(),
       Some(dirname) => compilation
         .options
         .output