Skip to content

Turbopack: Inline uses of the SliceMap type alias #87122

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mischnic merged 1 commit into from
Dec 15, 2025
Merged

Turbopack: Inline uses of the SliceMap type alias #87122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions turbopack/crates/turbo-tasks/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,8 +138,6 @@ pub use crate::{
},
};

pub type SliceMap<K, V> = Box<[(K, V)]>;

pub type FxIndexSet<T> = indexmap::IndexSet<T, BuildHasherDefault<FxHasher>>;
pub type FxIndexMap<K, V> = indexmap::IndexMap<K, V, BuildHasherDefault<FxHasher>>;
pub type FxDashMap<K, V> = dashmap::DashMap<K, V, BuildHasherDefault<FxHasher>>;
Expand Down
8 changes: 4 additions & 4 deletions turbopack/crates/turbopack-core/src/resolve/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ use tracing::{Instrument, Level};
use turbo_frozenmap::FrozenMap;
use turbo_rcstr::{RcStr, rcstr};
use turbo_tasks::{
FxIndexMap, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, SliceMap, TaskInput,
TryFlatJoinIterExt, TryJoinIterExt, ValueToString, Vc, trace::TraceRawVcs,
FxIndexMap, FxIndexSet, NonLocalValue, ReadRef, ResolvedVc, TaskInput, TryFlatJoinIterExt,
TryJoinIterExt, ValueToString, Vc, trace::TraceRawVcs,
};
use turbo_tasks_fs::{FileSystemEntryType, FileSystemPath};
use turbo_unix_path::normalize_request;
Expand Down Expand Up @@ -174,7 +174,7 @@ impl ExportUsage {
#[turbo_tasks::value(shared)]
#[derive(Clone, Debug)]
pub struct ModuleResolveResult {
pub primary: SliceMap<RequestKey, ModuleResolveResultItem>,
pub primary: Box<[(RequestKey, ModuleResolveResultItem)]>,
/// Affecting sources are other files that influence the resolve result. For example,
/// traversed symlinks
pub affecting_sources: Box<[ResolvedVc<Box<dyn Source>>]>,
Expand Down Expand Up @@ -514,7 +514,7 @@ impl RequestKey {
#[turbo_tasks::value(shared)]
#[derive(Clone)]
pub struct ResolveResult {
pub primary: SliceMap<RequestKey, ResolveResultItem>,
pub primary: Box<[(RequestKey, ResolveResultItem)]>,
/// Affecting sources are other files that influence the resolve result. For example,
/// traversed symlinks
pub affecting_sources: Box<[ResolvedVc<Box<dyn Source>>]>,
Expand Down
Loading