review: content_type without cell

Author: mischnic

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

@@ -53,7 +53,7 @@ impl Source for DataUriSource {
         );
         Ok(
             AssetIdent::from_path(self.lookup_path.join(filename.into()))
-                .with_content_type(Vc::cell(content_type)),
+                .with_content_type(content_type),
         )
     }
 }

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

@@ -27,8 +27,8 @@ pub struct AssetIdent {
     pub parts: Vec<ModulePart>,
     /// The asset layer the asset was created from.
     pub layer: Option<ResolvedVc<RcStr>>,
-
-    pub content_type: Option<ResolvedVc<RcStr>>,
+    /// The MIME content type, if this asset was created from a data URL.
+    pub content_type: Option<RcStr>,
 }
 
 impl AssetIdent {
@@ -101,7 +101,7 @@ impl ValueToString for AssetIdent {
         }
 
         if let Some(content_type) = &self.content_type {
-            write!(s, " <{}>", content_type.await?)?;
+            write!(s, " <{}>", content_type)?;
         }
 
         if !self.parts.is_empty() {
@@ -176,7 +176,7 @@ impl AssetIdent {
     }
 
     #[turbo_tasks::function]
-    pub fn with_content_type(&self, content_type: ResolvedVc<RcStr>) -> Vc<Self> {
+    pub fn with_content_type(&self, content_type: RcStr) -> Vc<Self> {
         let mut this = self.clone();
         this.content_type = Some(content_type);
         Self::new(Value::new(this))
@@ -324,7 +324,7 @@ impl AssetIdent {
         }
         if let Some(content_type) = content_type {
             1_u8.deterministic_hash(&mut hasher);
-            content_type.await?.deterministic_hash(&mut hasher);
+            content_type.deterministic_hash(&mut hasher);
             has_hash = true;
         }
 

turbopack/crates/turbopack/src/module_options/rule_condition.rs

@@ -101,8 +101,8 @@ impl RuleCondition {
                 ResolvedVc::try_downcast_type::<VirtualSource>(source).is_some()
             }
             RuleCondition::ContentTypeStartsWith(start) => {
-                if let Some(content_type) = source.ident().await?.content_type {
-                    content_type.await?.starts_with(start)
+                if let Some(content_type) = source.ident().await?.content_type.as_ref() {
+                    content_type.starts_with(start)
                 } else {
                     false
                 }