Fix turbopack-core

vercel · May 28, 2024 · e88150a · e88150a
1 parent 20b0697
commit e88150a
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/crates/turbopack-core/src/resolve/mod.rs b/crates/turbopack-core/src/resolve/mod.rs
@@ -1685,7 +1685,7 @@ async fn resolve_internal_inline(
                 fragment,
             } => {
                 let mut new_pat = path.clone();
-                new_pat.push_front(".".to_string().into());
+                new_pat.push_front(RcStr::from(".").into());
                 let relative = Request::relative(Value::new(new_pat), *query, *fragment, true);
 
                 if !has_alias {
@@ -1831,8 +1831,8 @@ async fn resolve_into_folder(
                     if let Some(field_value) = package_json[name].as_str() {
                         let normalized_request: RcStr = normalize_request(field_value).into();
                         if normalized_request.is_empty()
-                            || normalized_request == "."
-                            || normalized_request == "./"
+                            || &*normalized_request == "."
+                            || &*normalized_request == "./"
                         {
                             continue;
                         }
@@ -2175,7 +2175,7 @@ async fn resolve_module_request(
         options,
         options_value,
         |_| {
-            let full_pattern = Pattern::concat([module.to_string().into(), path.clone()]);
+            let full_pattern = Pattern::concat([RcStr::from(module).into(), path.clone()]);
             full_pattern.into_string()
         },
         query,
@@ -2244,8 +2244,8 @@ async fn resolve_module_request(
     if options_value.prefer_relative {
         let module_prefix: RcStr = format!("./{module}").into();
         let pattern = Pattern::concat([
-            module_prefix.clone().into_owned().into(),
-            "/".to_string().into(),
+            module_prefix.clone().into(),
+            RcStr::from("/").into(),
             path.clone(),
         ]);
         let relative = Request::relative(Value::new(pattern), query, fragment, true);
@@ -2294,7 +2294,7 @@ async fn resolve_into_package(
                     todo!("pattern into an exports field is not implemented yet");
                 };
 
-                let path = if path == "/" {
+                let path = if &*path == "/" {
                     ".".to_string()
                 } else {
                     format!(".{path}")

diff --git a/crates/turbopack-core/src/resolve/parse.rs b/crates/turbopack-core/src/resolve/parse.rs
@@ -185,7 +185,7 @@ impl Request {
                         .and_then(|caps| caps.get(1).zip(caps.get(2)))
                     {
                         let (path, query, fragment) =
-                            split_off_query_fragment(path.as_str().to_string());
+                            split_off_query_fragment(path.as_str().into());
 
                         return Request::Module {
                             module: module.as_str().into(),