prefer Option<Vc<IssueSource>> over Vc<OptionIssueSource>

crates/turbopack-cli-utils/src/runtime_entry.rs

@@ -4,7 +4,7 @@ use turbo_tasks_fs::FileSystemPath;
 use turbopack_core::{
     chunk::{EvaluatableAsset, EvaluatableAssetExt, EvaluatableAssets},
     context::AssetContext,
-    issue::{IssueSeverity, OptionIssueSource},
+    issue::IssueSeverity,
     module::Module,
     resolve::{origin::PlainResolveOrigin, parse::Request},
     source::Source,
@@ -36,7 +36,7 @@ impl RuntimeEntry {
         let modules = cjs_resolve(
             Vc::upcast(PlainResolveOrigin::new(asset_context, path)),
             request,
-            OptionIssueSource::none(),
+            None,
             IssueSeverity::Error.cell(),
         )
         .primary_modules()

crates/turbopack-core/src/issue/mod.rs

@@ -119,7 +119,7 @@ pub trait Issue {
     /// should point at the offending character. Displayed to the user alongside
     /// the title/description.
     fn source(self: Vc<Self>) -> Vc<OptionIssueSource> {
-        OptionIssueSource::none()
+        Vc::cell(None)
     }
 
     fn sub_issues(self: Vc<Self>) -> Vc<Issues> {
@@ -449,19 +449,6 @@ impl IssueSource {
 #[turbo_tasks::value(transparent)]
 pub struct OptionIssueSource(Option<Vc<IssueSource>>);
 
-#[turbo_tasks::value_impl]
-impl OptionIssueSource {
-    #[turbo_tasks::function]
-    pub fn some(source: Vc<IssueSource>) -> Vc<Self> {
-        Vc::cell(Some(source))
-    }
-
-    #[turbo_tasks::function]
-    pub fn none() -> Vc<Self> {
-        Vc::cell(None)
-    }
-}
-
 #[turbo_tasks::value(serialization = "none")]
 #[derive(Clone, Debug)]
 pub struct PlainIssue {

crates/turbopack-core/src/issue/resolve.rs

@@ -4,10 +4,10 @@ use anyhow::Result;
 use turbo_tasks::{ValueToString, Vc};
 use turbo_tasks_fs::FileSystemPath;
 
-use super::Issue;
+use super::{Issue, OptionIssueSource};
 use crate::{
     error::PrettyPrintError,
-    issue::{IssueSeverity, OptionIssueSource},
+    issue::{IssueSeverity, IssueSource},
     resolve::{options::ResolveOptions, parse::Request},
 };
 
@@ -19,7 +19,7 @@ pub struct ResolvingIssue {
     pub file_path: Vc<FileSystemPath>,
     pub resolve_options: Vc<ResolveOptions>,
     pub error_message: Option<String>,
-    pub source: Vc<OptionIssueSource>,
+    pub source: Option<Vc<IssueSource>>,
 }
 
 #[turbo_tasks::value_impl]
@@ -102,7 +102,7 @@ impl Issue for ResolvingIssue {
 
     #[turbo_tasks::function]
     fn source(&self) -> Vc<OptionIssueSource> {
-        self.source
+        Vc::cell(self.source)
     }
 
     // TODO add sub_issue for a description of resolve_options

crates/turbopack-core/src/resolve/mod.rs

@@ -52,7 +52,7 @@ pub use alias_map::{
 };
 pub use remap::{ResolveAliasMap, SubpathValue};
 
-use crate::issue::{IssueSeverity, OptionIssueSource};
+use crate::issue::{IssueSeverity, IssueSource};
 
 #[turbo_tasks::value(shared)]
 #[derive(Clone, Debug)]
@@ -1209,7 +1209,7 @@ async fn resolve_internal(
                      relative to the file you are importing from."
                         .to_string(),
                 ),
-                source: OptionIssueSource::none(),
+                source: None,
             }
             .cell()
             .emit();
@@ -1228,7 +1228,7 @@ async fn resolve_internal(
                 file_path: lookup_path,
                 resolve_options: options,
                 error_message: Some("windows imports are not implemented yet".to_string()),
-                source: OptionIssueSource::none(),
+                source: None,
             }
             .cell()
             .emit();
@@ -1275,7 +1275,7 @@ async fn resolve_internal(
                 file_path: lookup_path,
                 resolve_options: options,
                 error_message: None,
-                source: OptionIssueSource::none(),
+                source: None,
             }
             .cell()
             .emit();
@@ -1620,7 +1620,7 @@ async fn resolve_alias_field_result(
         request: Request::parse(Value::new(Pattern::Constant(issue_request.to_string()))),
         resolve_options,
         error_message: Some(format!("invalid alias field value: {}", result)),
-        source: OptionIssueSource::none(),
+        source: None,
     }
     .cell()
     .emit();
@@ -1791,7 +1791,7 @@ async fn resolve_package_internal_with_imports_field(
             request,
             resolve_options,
             error_message: None,
-            source: OptionIssueSource::none(),
+            source: None,
         }
         .cell()
         .emit();
@@ -1855,7 +1855,7 @@ pub async fn handle_resolve_error(
     origin_path: Vc<FileSystemPath>,
     request: Vc<Request>,
     resolve_options: Vc<ResolveOptions>,
-    source: Vc<OptionIssueSource>,
+    source: Option<Vc<IssueSource>>,
     severity: Vc<IssueSeverity>,
 ) -> Result<Vc<ModuleResolveResult>> {
     Ok(match result.is_unresolveable().await {

crates/turbopack-css/src/references/compose.rs

@@ -2,7 +2,6 @@ use anyhow::Result;
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     chunk::ChunkableModuleReference,
-    issue::OptionIssueSource,
     reference::ModuleReference,
     reference_type::CssReferenceSubType,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
@@ -38,7 +37,7 @@ impl ModuleReference for CssModuleComposeReference {
             // TODO: add real issue source, currently impossible because `CssClassName` doesn't
             // contain the source span
             // https://docs.rs/swc_css_modules/0.21.16/swc_css_modules/enum.CssClassName.html
-            OptionIssueSource::none(),
+            None,
         )
     }
 }

crates/turbopack-css/src/references/import.rs

@@ -12,7 +12,7 @@ use swc_core::{
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     chunk::{ChunkableModuleReference, ChunkingContext},
-    issue::{IssueSource, OptionIssueSource},
+    issue::IssueSource,
     reference::ModuleReference,
     reference_type::CssReferenceSubType,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
@@ -218,7 +218,7 @@ impl ModuleReference for ImportAssetReference {
             self.origin,
             self.request,
             Value::new(CssReferenceSubType::AtImport),
-            OptionIssueSource::some(self.issue_source),
+            Some(self.issue_source),
         )
     }
 }

crates/turbopack-css/src/references/mod.rs

@@ -12,7 +12,7 @@ use swc_core::{
 };
 use turbo_tasks::{Value, Vc};
 use turbopack_core::{
-    issue::{IssueSeverity, IssueSource, OptionIssueSource},
+    issue::{IssueSeverity, IssueSource},
     reference::{ModuleReference, ModuleReferences},
     reference_type::{CssReferenceSubType, ReferenceType},
     resolve::{
@@ -177,7 +177,7 @@ pub async fn css_resolve(
     origin: Vc<Box<dyn ResolveOrigin>>,
     request: Vc<Request>,
     ty: Value<CssReferenceSubType>,
-    issue_source: Vc<OptionIssueSource>,
+    issue_source: Option<Vc<IssueSource>>,
 ) -> Result<Vc<ModuleResolveResult>> {
     let ty = Value::new(ReferenceType::Css(ty.into_value()));
     let options = origin.resolve_options(ty.clone());

crates/turbopack-ecmascript/src/references/amd.rs

@@ -15,7 +15,7 @@ use turbo_tasks::{
 };
 use turbopack_core::{
     chunk::ChunkableModuleReference,
-    issue::{IssueSource, OptionIssueSource},
+    issue::IssueSource,
     reference::ModuleReference,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
 };
@@ -63,7 +63,7 @@ impl ModuleReference for AmdDefineAssetReference {
         cjs_resolve(
             self.origin,
             self.request,
-            OptionIssueSource::some(self.issue_source),
+            Some(self.issue_source),
             try_to_severity(self.in_try),
         )
     }
@@ -156,7 +156,7 @@ impl CodeGenerateable for AmdDefineWithDependenciesCodeGen {
                                 cjs_resolve(
                                     self.origin,
                                     *request,
-                                    OptionIssueSource::some(self.issue_source),
+                                    Some(self.issue_source),
                                     try_to_severity(self.in_try),
                                 ),
                                 Value::new(Cjs),

crates/turbopack-ecmascript/src/references/cjs.rs

@@ -6,7 +6,7 @@ use swc_core::{
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     chunk::ChunkableModuleReference,
-    issue::{IssueSource, OptionIssueSource},
+    issue::IssueSource,
     reference::ModuleReference,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
 };
@@ -54,7 +54,7 @@ impl ModuleReference for CjsAssetReference {
         cjs_resolve(
             self.origin,
             self.request,
-            OptionIssueSource::some(self.issue_source),
+            Some(self.issue_source),
             try_to_severity(self.in_try),
         )
     }
@@ -111,7 +111,7 @@ impl ModuleReference for CjsRequireAssetReference {
         cjs_resolve(
             self.origin,
             self.request,
-            OptionIssueSource::some(self.issue_source),
+            Some(self.issue_source),
             try_to_severity(self.in_try),
         )
     }
@@ -145,7 +145,7 @@ impl CodeGenerateable for CjsRequireAssetReference {
             cjs_resolve(
                 self.origin,
                 self.request,
-                OptionIssueSource::some(self.issue_source),
+                Some(self.issue_source),
                 try_to_severity(self.in_try),
             ),
             Value::new(Cjs),
@@ -235,7 +235,7 @@ impl ModuleReference for CjsRequireResolveAssetReference {
         cjs_resolve(
             self.origin,
             self.request,
-            OptionIssueSource::some(self.issue_source),
+            Some(self.issue_source),
             try_to_severity(self.in_try),
         )
     }
@@ -269,7 +269,7 @@ impl CodeGenerateable for CjsRequireResolveAssetReference {
             cjs_resolve(
                 self.origin,
                 self.request,
-                OptionIssueSource::some(self.issue_source),
+                Some(self.issue_source),
                 try_to_severity(self.in_try),
             ),
             Value::new(Cjs),

crates/turbopack-ecmascript/src/references/esm/base.rs

@@ -11,7 +11,7 @@ use turbopack_core::{
         ChunkItemExt, ChunkableModule, ChunkableModuleReference, ChunkingContext, ChunkingType,
         ChunkingTypeOption, ModuleId,
     },
-    issue::{IssueSeverity, OptionIssueSource},
+    issue::IssueSeverity,
     module::Module,
     reference::ModuleReference,
     reference_type::EcmaScriptModulesReferenceSubType,
@@ -162,7 +162,7 @@ impl ModuleReference for EsmAssetReference {
             self.get_origin().resolve().await?,
             self.request,
             ty,
-            OptionIssueSource::none(),
+            None,
             IssueSeverity::Error.cell(),
         ))
     }

crates/turbopack-ecmascript/src/references/esm/dynamic.rs

@@ -6,7 +6,7 @@ use swc_core::{
 use turbo_tasks::{Value, ValueToString, Vc};
 use turbopack_core::{
     chunk::{ChunkableModuleReference, ChunkingType, ChunkingTypeOption},
-    issue::{IssueSource, OptionIssueSource},
+    issue::IssueSource,
     reference::ModuleReference,
     reference_type::EcmaScriptModulesReferenceSubType,
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
@@ -59,7 +59,7 @@ impl ModuleReference for EsmAsyncAssetReference {
             self.origin,
             self.request,
             Default::default(),
-            OptionIssueSource::some(self.issue_source),
+            Some(self.issue_source),
             try_to_severity(self.in_try),
         )
     }
@@ -99,7 +99,7 @@ impl CodeGenerateable for EsmAsyncAssetReference {
                 self.origin,
                 self.request,
                 Value::new(EcmaScriptModulesReferenceSubType::Undefined),
-                OptionIssueSource::some(self.issue_source).resolve().await?,
+                Some(self.issue_source),
                 try_to_severity(self.in_try),
             ),
             Value::new(EsmAsync),

crates/turbopack-ecmascript/src/references/mod.rs

@@ -51,7 +51,7 @@ use turbo_tasks_fs::{FileJsonContent, FileSystemPath};
 use turbopack_core::{
     compile_time_info::{CompileTimeInfo, FreeVarReference},
     error::PrettyPrintError,
-    issue::{analyze::AnalyzeIssue, IssueExt, IssueSeverity, IssueSource, OptionIssueSource},
+    issue::{analyze::AnalyzeIssue, IssueExt, IssueSeverity, IssueSource},
     module::Module,
     reference::{ModuleReference, ModuleReferences, SourceMapReference},
     reference_type::{CommonJsReferenceSubType, ReferenceType},
@@ -1190,7 +1190,7 @@ async fn handle_call<G: Fn(Vec<Effect>) + Send + Sync>(
                 options.include_subdirs,
                 Vc::cell(options.filter),
                 Vc::cell(ast_path.to_vec()),
-                OptionIssueSource::some(issue_source(source, span)),
+                Some(issue_source(source, span)),
                 in_try,
             ));
         }
@@ -2100,12 +2100,7 @@ async fn require_resolve_visitor(
     Ok(if args.len() == 1 {
         let pat = js_value_to_pattern(&args[0]);
         let request = Request::parse(Value::new(pat.clone()));
-        let resolved = cjs_resolve(
-            origin,
-            request,
-            OptionIssueSource::none(),
-            try_to_severity(in_try),
-        );
+        let resolved = cjs_resolve(origin, request, None, try_to_severity(in_try));
         let mut values = resolved
             .primary_modules()
             .await?
@@ -2167,7 +2162,7 @@ async fn require_context_visitor(
         dir,
         options.include_subdirs,
         Vc::cell(options.filter),
-        OptionIssueSource::none(),
+        None,
         try_to_severity(in_try),
     );
 

crates/turbopack-ecmascript/src/references/require_context.rs

@@ -22,7 +22,7 @@ use turbopack_core::{
         ChunkingContext,
     },
     ident::AssetIdent,
-    issue::{IssueSeverity, OptionIssueSource},
+    issue::{IssueSeverity, IssueSource},
     module::Module,
     reference::{ModuleReference, ModuleReferences},
     resolve::{origin::ResolveOrigin, parse::Request, ModuleResolveResult},
@@ -165,7 +165,7 @@ impl RequireContextMap {
         dir: Vc<FileSystemPath>,
         recursive: bool,
         filter: Vc<Regex>,
-        issue_source: Vc<OptionIssueSource>,
+        issue_source: Option<Vc<IssueSource>>,
         issue_severity: Vc<IssueSeverity>,
     ) -> Result<Vc<Self>> {
         let origin_path = &*origin.origin_path().parent().await?;
@@ -206,7 +206,7 @@ pub struct RequireContextAssetReference {
     pub include_subdirs: bool,
 
     pub path: Vc<AstPath>,
-    pub issue_source: Vc<OptionIssueSource>,
+    pub issue_source: Option<Vc<IssueSource>>,
     pub in_try: bool,
 }
 
@@ -220,7 +220,7 @@ impl RequireContextAssetReference {
         include_subdirs: bool,
         filter: Vc<Regex>,
         path: Vc<AstPath>,
-        issue_source: Vc<OptionIssueSource>,
+        issue_source: Option<Vc<IssueSource>>,
         in_try: bool,
     ) -> Vc<Self> {
         let map = RequireContextMap::generate(