fixup

Author: sokra

Diff for: turbopack/crates/turbopack-core/src/code_builder.rs

@@ -5,7 +5,7 @@ use std::{
 };
 
 use anyhow::{Context, Result};
-use indexmap::{IndexMap, IndexSet};
+use indexmap::IndexMap;
 use turbo_tasks::{ResolvedVc, Vc};
 use turbo_tasks_fs::{
     rope::{Rope, RopeBuilder},

Diff for: turbopack/crates/turbopack-core/src/source_map/mod.rs

@@ -1,7 +1,6 @@
 use std::{borrow::Cow, io::Write, ops::Deref, sync::Arc};
 
 use anyhow::Result;
-use indexmap::IndexSet;
 use once_cell::sync::Lazy;
 use ref_cast::RefCast;
 use regex::Regex;
@@ -15,8 +14,8 @@ use turbo_tasks_fs::{
 };
 
 use crate::{
-    asset::AssetContent, source::Source, source_pos::SourcePos, virtual_source::VirtualSource,
-    SOURCE_MAP_PREFIX,
+    asset::AssetContent, source::Source, source_map::utils::add_default_ignore_list,
+    source_pos::SourcePos, virtual_source::VirtualSource, SOURCE_MAP_PREFIX,
 };
 
 pub(crate) mod source_map_asset;
@@ -422,11 +421,7 @@ impl SourceMap {
                 .collect::<Vec<_>>();
             let mut new_sources = Vec::with_capacity(count);
             let mut new_source_contents = Vec::with_capacity(count);
-            for (src_id, (source, source_content)) in sources
-                .into_iter()
-                .zip(source_contents.into_iter())
-                .enumerate()
-            {
+            for (source, source_content) in sources.into_iter().zip(source_contents.into_iter()) {
                 let (source, name) = resolve_source(source, source_content, origin).await?;
                 new_sources.push(source);
                 new_source_contents.push(Some(name));

Diff for: turbopack/crates/turbopack-core/src/source_map/utils.rs

@@ -1,16 +1,19 @@
 use std::collections::HashSet;
 
+use const_format::concatcp;
 use sourcemap::SourceMap;
 
+use crate::SOURCE_MAP_PREFIX;
+
 pub fn add_default_ignore_list(map: &mut SourceMap) {
     let mut ignored_ids = HashSet::new();
 
-    for (src_id, src) in map.sources().enumerate() {
+    for (source_id, source) in map.sources().enumerate() {
         if source.starts_with(concatcp!(SOURCE_MAP_PREFIX, "[next]"))
             || source.starts_with(concatcp!(SOURCE_MAP_PREFIX, "[turbopack]"))
             || source.contains("/node_modules/")
         {
-            ignored_ids.insert(src_id);
+            ignored_ids.insert(source_id);
         }
     }
 

Diff for: turbopack/crates/turbopack-ecmascript/src/parse.rs

@@ -124,7 +124,7 @@ impl GenerateSourceMap for ParseResultSourceMap {
         } else {
             None
         };
-        let map = self.files_map.build_source_map_with_config(
+        let mut map = self.files_map.build_source_map_with_config(
             &self.mappings,
             input_map.as_deref(),
             InlineSourcesContentConfig {},