diff --git a/crates/turbopack-core/src/resolve/options.rs b/crates/turbopack-core/src/resolve/options.rs index 5182bedde5360..84a97a19d5483 100644 --- a/crates/turbopack-core/src/resolve/options.rs +++ b/crates/turbopack-core/src/resolve/options.rs @@ -154,7 +154,7 @@ impl AliasTemplate for Vc { .await?, ), ImportMapping::Dynamic(replacement) => { - (*replacement.replace(capture.to_string()).await?).clone() + (*replacement.replace(capture.into()).await?).clone() } } .cell()) @@ -523,7 +523,7 @@ pub async fn resolve_modules_options( #[turbo_tasks::value_trait] pub trait ImportMappingReplacement { - fn replace(self: Vc, capture: String) -> Vc; + fn replace(self: Vc, capture: RcStr) -> Vc; fn result( self: Vc, lookup_path: Vc, diff --git a/crates/turbopack-core/src/resolve/origin.rs b/crates/turbopack-core/src/resolve/origin.rs index 9bccf4158552e..ca292c03e7681 100644 --- a/crates/turbopack-core/src/resolve/origin.rs +++ b/crates/turbopack-core/src/resolve/origin.rs @@ -44,7 +44,7 @@ pub trait ResolveOriginExt: Send { fn resolve_options(self: Vc, reference_type: Value) -> Vc; /// Adds a transition that is used for resolved assets. - fn with_transition(self: Vc, transition: String) -> Vc>; + fn with_transition(self: Vc, transition: RcStr) -> Vc>; } impl ResolveOriginExt for T @@ -65,7 +65,7 @@ where .resolve_options(self.origin_path(), reference_type) } - fn with_transition(self: Vc, transition: String) -> Vc> { + fn with_transition(self: Vc, transition: RcStr) -> Vc> { Vc::upcast( ResolveOriginWithTransition { previous: Vc::upcast(self), diff --git a/crates/turbopack-core/src/resolve/parse.rs b/crates/turbopack-core/src/resolve/parse.rs index b5654d06d0581..55683fc5069a1 100644 --- a/crates/turbopack-core/src/resolve/parse.rs +++ b/crates/turbopack-core/src/resolve/parse.rs @@ -141,7 +141,7 @@ impl Request { Request::PackageInternal { path: Pattern::Constant(r), } - } else if r.starts_with("./") || r.starts_with("../") || r == "." || r == ".." { + } else if r.starts_with("./") || r.starts_with("../") || &*r == "." || &*r == ".." { let (path, query, fragment) = split_off_query_fragment(r); Request::Relative {