remove the query() method

Author: lukesandberg

turbopack/crates/turbopack-core/src/ident.rs

@@ -197,11 +197,6 @@ impl AssetIdent {
         *self.path
     }
 
-    #[turbo_tasks::function]
-    pub fn query(&self) -> Vc<RcStr> {
-        Vc::cell(self.query.clone())
-    }
-
     /// Computes a unique output asset name for the given asset identifier.
     /// TODO(alexkirsz) This is `turbopack-browser` specific, as
     /// `turbopack-nodejs` would use a content hash instead. But for now

turbopack/crates/turbopack-ecmascript/src/parse.rs

@@ -226,7 +226,7 @@ async fn parse_internal(
                         fs_path_vc,
                         fs_path,
                         ident,
-                        source.ident().query().owned().await?,
+                        source.ident().await?.query.clone(),
                         file_path_hash,
                         source,
                         ty,

turbopack/crates/turbopack-node/src/transforms/webpack.rs

@@ -266,7 +266,7 @@ impl WebpackLoadersProcessedAsset {
                 ResolvedVc::cell(content),
                 // We need to pass the query string to the loader
                 ResolvedVc::cell(resource_path.to_string().into()),
-                ResolvedVc::cell(this.source.ident().query().await?.to_string().into()),
+                ResolvedVc::cell(this.source.ident().await?.query.to_string().into()),
                 ResolvedVc::cell(json!(*loaders)),
                 ResolvedVc::cell(transform.source_maps.into()),
             ],

turbopack/crates/turbopack-wasm/src/module_asset.rs

@@ -63,7 +63,7 @@ impl WebAssemblyModuleAsset {
     #[turbo_tasks::function]
     async fn loader_as_module(self: Vc<Self>) -> Result<Vc<Box<dyn Module>>> {
         let this = self.await?;
-        let query = &*this.source.ident().query().await?;
+        let query = &this.source.ident().await?.query;
 
         let loader_source = if query == "module" {
             compiling_loader_source(*this.source)

turbopack/crates/turbopack-wasm/src/source.rs

@@ -1,5 +1,6 @@
 use anyhow::Result;
 use serde::{Deserialize, Serialize};
+use turbo_rcstr::rcstr;
 use turbo_tasks::{NonLocalValue, ResolvedVc, TaskInput, Vc, trace::TraceRawVcs};
 use turbo_tasks_fs::{File, FileContent};
 use turbopack_core::{
@@ -56,7 +57,7 @@ impl Source for WebAssemblySource {
             WebAssemblySourceType::Text => self
                 .source
                 .ident()
-                .with_path(self.source.ident().path().append("_.wasm".into())),
+                .with_path(self.source.ident().path().append(rcstr!("_.wasm"))),
         }
     }
 }