Unverified Commit 3fbe7292 authored by Benjamin Woodruff's avatar Benjamin Woodruff Committed by GitHub

refactor(turbo-rcstr): Move turbo_tasks::RcStr into it's own crate (#72858)

The `RcStr` type doesn't use anything in `turbo-tasks`, so there's no reason it can't be a separate crate that doesn't depend on `turbo-tasks`.

This will let it be used in wasm swc plugins, where turbo-tasks does not currently compile.

Imports were automatically rewritten with:

```
# Fix imports:
sg run --lang rust --pattern 'use $CRATE::{$$$PRE, RcStr};' --rewrite 'use $CRATE::{$$$PRE}; use turbo_rcstr::RcStr;' --update-all
sg run --lang rust --pattern 'use $CRATE::{RcStr, $$$POST};' --rewrite 'use $CRATE::{$$$POST}; use turbo_rcstr::RcStr;' --update-all
sg run --lang rust --pattern 'use $CRATE::{$$$PRE, RcStr, $$$POST};' --rewrite 'use $CRATE::{$$$PRE, $$$POST}; use turbo_rcstr::RcStr;' --update-all
sg run --lang rust --pattern 'use $CRATE::RcStr;' --rewrite 'use turbo_rcstr::RcStr;' --update-all
cargo fmt

# Fix strings in comments:
fastmod crate::RcStr turbo_rcstr::RcStr
fastmod turbo_tasks::RcStr turbo_rcstr::RcStr
```

I had to manually fix the `Cargo.toml` files based on the compilation errors.
parent 560d95bd
...@@ -3944,6 +3944,7 @@ dependencies = [ ...@@ -3944,6 +3944,7 @@ dependencies = [
"shadow-rs", "shadow-rs",
"swc_core", "swc_core",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
...@@ -3984,6 +3985,7 @@ dependencies = [ ...@@ -3984,6 +3985,7 @@ dependencies = [
"tokio-stream", "tokio-stream",
"tracing", "tracing",
"tracing-subscriber", "tracing-subscriber",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
...@@ -4031,6 +4033,7 @@ dependencies = [ ...@@ -4031,6 +4033,7 @@ dependencies = [
"swc_relay", "swc_relay",
"thiserror", "thiserror",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-bytes", "turbo-tasks-bytes",
...@@ -4118,6 +4121,7 @@ dependencies = [ ...@@ -4118,6 +4121,7 @@ dependencies = [
"tracing", "tracing",
"tracing-chrome", "tracing-chrome",
"tracing-subscriber", "tracing-subscriber",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-backend", "turbo-tasks-backend",
"turbo-tasks-build", "turbo-tasks-build",
...@@ -8311,6 +8315,15 @@ dependencies = [ ...@@ -8311,6 +8315,15 @@ dependencies = [
name = "turbo-prehash" name = "turbo-prehash"
version = "0.1.0" version = "0.1.0"
[[package]]
name = "turbo-rcstr"
version = "0.1.0"
dependencies = [
"serde",
"triomphe 0.1.12",
"turbo-tasks-hash",
]
[[package]] [[package]]
name = "turbo-static" name = "turbo-static"
version = "0.1.0" version = "0.1.0"
...@@ -8360,6 +8373,7 @@ dependencies = [ ...@@ -8360,6 +8373,7 @@ dependencies = [
"tokio-util", "tokio-util",
"tracing", "tracing",
"triomphe 0.1.12", "triomphe 0.1.12",
"turbo-rcstr",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-hash", "turbo-tasks-hash",
"turbo-tasks-macros", "turbo-tasks-macros",
...@@ -8396,6 +8410,7 @@ dependencies = [ ...@@ -8396,6 +8410,7 @@ dependencies = [
"tokio-scoped", "tokio-scoped",
"tracing", "tracing",
"turbo-prehash", "turbo-prehash",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-hash", "turbo-tasks-hash",
...@@ -8438,6 +8453,7 @@ dependencies = [ ...@@ -8438,6 +8453,7 @@ dependencies = [
"dotenvs", "dotenvs",
"indexmap 2.5.0", "indexmap 2.5.0",
"serde", "serde",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8452,6 +8468,7 @@ dependencies = [ ...@@ -8452,6 +8468,7 @@ dependencies = [
"reqwest", "reqwest",
"serde", "serde",
"tokio", "tokio",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8490,6 +8507,7 @@ dependencies = [ ...@@ -8490,6 +8507,7 @@ dependencies = [
"tempfile", "tempfile",
"tokio", "tokio",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-hash", "turbo-tasks-hash",
...@@ -8576,6 +8594,7 @@ dependencies = [ ...@@ -8576,6 +8594,7 @@ dependencies = [
"tokio", "tokio",
"tracing", "tracing",
"turbo-prehash", "turbo-prehash",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-hash", "turbo-tasks-hash",
...@@ -8592,6 +8611,7 @@ dependencies = [ ...@@ -8592,6 +8611,7 @@ dependencies = [
"futures", "futures",
"rustc-hash 1.1.0", "rustc-hash 1.1.0",
"tokio", "tokio",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
] ]
...@@ -8612,6 +8632,7 @@ dependencies = [ ...@@ -8612,6 +8632,7 @@ dependencies = [
"serde_json", "serde_json",
"tokio", "tokio",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
...@@ -8666,6 +8687,7 @@ dependencies = [ ...@@ -8666,6 +8687,7 @@ dependencies = [
"serde_json", "serde_json",
"serde_qs", "serde_qs",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8693,6 +8715,7 @@ dependencies = [ ...@@ -8693,6 +8715,7 @@ dependencies = [
"serde", "serde",
"tokio", "tokio",
"tracing-subscriber", "tracing-subscriber",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
...@@ -8755,6 +8778,7 @@ dependencies = [ ...@@ -8755,6 +8778,7 @@ dependencies = [
"swc_core", "swc_core",
"tokio", "tokio",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
...@@ -8790,6 +8814,7 @@ dependencies = [ ...@@ -8790,6 +8814,7 @@ dependencies = [
"smallvec", "smallvec",
"swc_core", "swc_core",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8823,6 +8848,7 @@ dependencies = [ ...@@ -8823,6 +8848,7 @@ dependencies = [
"tokio-stream", "tokio-stream",
"tokio-util", "tokio-util",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-bytes", "turbo-tasks-bytes",
...@@ -8860,6 +8886,7 @@ dependencies = [ ...@@ -8860,6 +8886,7 @@ dependencies = [
"swc_core", "swc_core",
"tokio", "tokio",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8900,6 +8927,7 @@ dependencies = [ ...@@ -8900,6 +8927,7 @@ dependencies = [
"swc_emotion", "swc_emotion",
"swc_relay", "swc_relay",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8914,6 +8942,7 @@ dependencies = [ ...@@ -8914,6 +8942,7 @@ dependencies = [
"anyhow", "anyhow",
"indoc", "indoc",
"serde", "serde",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8929,6 +8958,7 @@ dependencies = [ ...@@ -8929,6 +8958,7 @@ dependencies = [
"anyhow", "anyhow",
"indexmap 2.5.0", "indexmap 2.5.0",
"serde", "serde",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-env", "turbo-tasks-env",
...@@ -8962,6 +8992,7 @@ dependencies = [ ...@@ -8962,6 +8992,7 @@ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
"serde_json", "serde_json",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -8977,6 +9008,7 @@ dependencies = [ ...@@ -8977,6 +9008,7 @@ dependencies = [
"markdown", "markdown",
"mdxjs", "mdxjs",
"serde", "serde",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -9007,6 +9039,7 @@ dependencies = [ ...@@ -9007,6 +9039,7 @@ dependencies = [
"serde_with", "serde_with",
"tokio", "tokio",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-bytes", "turbo-tasks-bytes",
...@@ -9028,6 +9061,7 @@ dependencies = [ ...@@ -9028,6 +9061,7 @@ dependencies = [
"indoc", "indoc",
"serde", "serde",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -9049,6 +9083,7 @@ dependencies = [ ...@@ -9049,6 +9083,7 @@ dependencies = [
"serde", "serde",
"serde_json", "serde_json",
"tracing", "tracing",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -9061,6 +9096,7 @@ version = "0.1.0" ...@@ -9061,6 +9096,7 @@ version = "0.1.0"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"serde", "serde",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -9075,6 +9111,7 @@ name = "turbopack-swc-utils" ...@@ -9075,6 +9111,7 @@ name = "turbopack-swc-utils"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"swc_core", "swc_core",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbopack-core", "turbopack-core",
...@@ -9089,6 +9126,7 @@ dependencies = [ ...@@ -9089,6 +9126,7 @@ dependencies = [
"regex", "regex",
"serde", "serde",
"similar", "similar",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
...@@ -9110,6 +9148,7 @@ dependencies = [ ...@@ -9110,6 +9148,7 @@ dependencies = [
"serde_json", "serde_json",
"testing", "testing",
"tokio", "tokio",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-bytes", "turbo-tasks-bytes",
...@@ -9172,6 +9211,7 @@ dependencies = [ ...@@ -9172,6 +9211,7 @@ dependencies = [
"indexmap 2.5.0", "indexmap 2.5.0",
"indoc", "indoc",
"serde", "serde",
"turbo-rcstr",
"turbo-tasks", "turbo-tasks",
"turbo-tasks-build", "turbo-tasks-build",
"turbo-tasks-fs", "turbo-tasks-fs",
......
...@@ -42,6 +42,7 @@ next-custom-transforms = { path = "crates/next-custom-transforms" } ...@@ -42,6 +42,7 @@ next-custom-transforms = { path = "crates/next-custom-transforms" }
auto-hash-map = { path = "turbopack/crates/turbo-tasks-auto-hash-map" } auto-hash-map = { path = "turbopack/crates/turbo-tasks-auto-hash-map" }
swc-ast-explorer = { path = "turbopack/crates/turbopack-swc-ast-explorer" } swc-ast-explorer = { path = "turbopack/crates/turbopack-swc-ast-explorer" }
turbo-prehash = { path = "turbopack/crates/turbo-prehash" } turbo-prehash = { path = "turbopack/crates/turbo-prehash" }
turbo-rcstr = { path = "turbopack/crates/turbo-rcstr" }
turbo-tasks-malloc = { path = "turbopack/crates/turbo-tasks-malloc", default-features = false } turbo-tasks-malloc = { path = "turbopack/crates/turbo-tasks-malloc", default-features = false }
turbo-tasks = { path = "turbopack/crates/turbo-tasks" } turbo-tasks = { path = "turbopack/crates/turbo-tasks" }
turbo-tasks-backend = { path = "turbopack/crates/turbo-tasks-backend" } turbo-tasks-backend = { path = "turbopack/crates/turbo-tasks-backend" }
......
...@@ -96,6 +96,7 @@ swc_core = { workspace = true, features = [ ...@@ -96,6 +96,7 @@ swc_core = { workspace = true, features = [
[target.'cfg(not(target_arch = "wasm32"))'.dependencies] [target.'cfg(not(target_arch = "wasm32"))'.dependencies]
lightningcss-napi = { workspace = true } lightningcss-napi = { workspace = true }
tokio = { workspace = true, features = ["full"] } tokio = { workspace = true, features = ["full"] }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-memory = { workspace = true } turbo-tasks-memory = { workspace = true }
turbo-tasks-backend = { workspace = true } turbo-tasks-backend = { workspace = true }
......
...@@ -23,7 +23,8 @@ use rand::Rng; ...@@ -23,7 +23,8 @@ use rand::Rng;
use tokio::{io::AsyncWriteExt, time::Instant}; use tokio::{io::AsyncWriteExt, time::Instant};
use tracing::Instrument; use tracing::Instrument;
use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry}; use tracing_subscriber::{layer::SubscriberExt, util::SubscriberInitExt, EnvFilter, Registry};
use turbo_tasks::{Completion, RcStr, ReadRef, TransientInstance, UpdateInfo, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{Completion, ReadRef, TransientInstance, UpdateInfo, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
util::uri_from_file, DiskFileSystem, FileContent, FileSystem, FileSystemPath, util::uri_from_file, DiskFileSystem, FileContent, FileSystem, FileSystemPath,
}; };
......
...@@ -22,6 +22,7 @@ serde = { workspace = true } ...@@ -22,6 +22,7 @@ serde = { workspace = true }
serde_json = { workspace = true } serde_json = { workspace = true }
shadow-rs = { workspace = true } shadow-rs = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-env = { workspace = true } turbo-tasks-env = { workspace = true }
turbo-tasks-fs = { workspace = true } turbo-tasks-fs = { workspace = true }
......
...@@ -37,9 +37,10 @@ use next_core::{ ...@@ -37,9 +37,10 @@ use next_core::{
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
fxindexset, trace::TraceRawVcs, Completion, FxIndexMap, FxIndexSet, RcStr, ResolvedVc, fxindexset, trace::TraceRawVcs, Completion, FxIndexMap, FxIndexSet, ResolvedVc, TryJoinIterExt,
TryJoinIterExt, Value, ValueToString, Vc, Value, ValueToString, Vc,
}; };
use turbo_tasks_env::{CustomProcessEnv, ProcessEnv}; use turbo_tasks_env::{CustomProcessEnv, ProcessEnv};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
......
...@@ -8,10 +8,11 @@ use swc_core::ecma::{ ...@@ -8,10 +8,11 @@ use swc_core::ecma::{
visit::{Visit, VisitWith}, visit::{Visit, VisitWith},
}; };
use tracing::{Instrument, Level}; use tracing::{Instrument, Level};
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
graph::{GraphTraversal, NonDeterministic, VisitControlFlow, VisitedNodes}, graph::{GraphTraversal, NonDeterministic, VisitControlFlow, VisitedNodes},
trace::TraceRawVcs, trace::TraceRawVcs,
FxIndexMap, RcStr, ReadRef, ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc, FxIndexMap, ReadRef, ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{ chunk::{
......
use turbo_tasks::{FxIndexMap, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, Vc};
use crate::{ use crate::{
project::{Instrumentation, Middleware}, project::{Instrumentation, Middleware},
......
use anyhow::Result; use anyhow::Result;
use next_core::{all_assets_from_entries, next_manifests::NextFontManifest}; use next_core::{all_assets_from_entries, next_manifests::NextFontManifest};
use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystemPath}; use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
......
...@@ -6,7 +6,8 @@ use next_core::{ ...@@ -6,7 +6,8 @@ use next_core::{
next_server::{get_server_runtime_entries, ServerContextType}, next_server::{get_server_runtime_entries, ServerContextType},
}; };
use tracing::Instrument; use tracing::Instrument;
use turbo_tasks::{Completion, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{Completion, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
......
...@@ -2,7 +2,8 @@ use std::collections::HashMap; ...@@ -2,7 +2,8 @@ use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use next_core::next_manifests::LoadableManifest; use next_core::next_manifests::LoadableManifest;
use turbo_tasks::{RcStr, ResolvedVc, TryFlatJoinIterExt, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
......
...@@ -8,7 +8,8 @@ use next_core::{ ...@@ -8,7 +8,8 @@ use next_core::{
util::{parse_config_from_source, MiddlewareMatcherKind}, util::{parse_config_from_source, MiddlewareMatcherKind},
}; };
use tracing::Instrument; use tracing::Instrument;
use turbo_tasks::{Completion, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{Completion, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{self, File, FileContent, FileSystemPath}; use turbo_tasks_fs::{self, File, FileContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde_json::json; use serde_json::json;
use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{DiskFileSystem, File, FileSystem, FileSystemPath, VirtualFileSystem}; use turbo_tasks_fs::{DiskFileSystem, File, FileSystem, FileSystemPath, VirtualFileSystem};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
...@@ -27,9 +27,9 @@ use next_core::{ ...@@ -27,9 +27,9 @@ use next_core::{
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, Completion, FxIndexMap, RcStr, ResolvedVc, TaskInput, TryJoinIterExt, trace::TraceRawVcs, Completion, FxIndexMap, ResolvedVc, TaskInput, TryJoinIterExt, Value, Vc,
Value, Vc,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
self, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem, self, File, FileContent, FileSystem, FileSystemPath, FileSystemPathOption, VirtualFileSystem,
......
use anyhow::Result; use anyhow::Result;
use next_core::{all_assets_from_entries, next_manifests::AssetBinding}; use next_core::{all_assets_from_entries, next_manifests::AssetBinding};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, ResolvedVc, TryFlatJoinIterExt, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, TryFlatJoinIterExt, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
...@@ -22,13 +22,14 @@ use next_core::{ ...@@ -22,13 +22,14 @@ use next_core::{
}; };
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, debug::ValueDebugFormat,
fxindexmap, fxindexmap,
graph::{AdjacencyMap, GraphTraversal}, graph::{AdjacencyMap, GraphTraversal},
trace::TraceRawVcs, trace::TraceRawVcs,
Completion, Completions, FxIndexMap, IntoTraitRef, RcStr, ReadRef, ResolvedVc, State, Completion, Completions, FxIndexMap, IntoTraitRef, ReadRef, ResolvedVc, State, TaskInput,
TaskInput, TransientInstance, TryFlatJoinIterExt, Value, Vc, TransientInstance, TryFlatJoinIterExt, Value, Vc,
}; };
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem}; use turbo_tasks_fs::{DiskFileSystem, FileSystem, FileSystemPath, VirtualFileSystem};
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, Completion, FxIndexMap, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{debug::ValueDebugFormat, trace::TraceRawVcs, Completion, FxIndexMap, Vc};
use turbopack_core::module::Modules; use turbopack_core::module::Modules;
use crate::paths::ServerPath; use crate::paths::ServerPath;
......
...@@ -17,9 +17,10 @@ use swc_core::{ ...@@ -17,9 +17,10 @@ use swc_core::{
}, },
}; };
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
graph::{GraphTraversal, NonDeterministic}, graph::{GraphTraversal, NonDeterministic},
FxIndexMap, RcStr, ResolvedVc, TryFlatJoinIterExt, Value, ValueToString, Vc, FxIndexMap, ResolvedVc, TryFlatJoinIterExt, Value, ValueToString, Vc,
}; };
use turbo_tasks_fs::{self, rope::RopeBuilder, File, FileSystemPath}; use turbo_tasks_fs::{self, rope::RopeBuilder, File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
......
...@@ -3,8 +3,9 @@ use std::collections::{HashMap, HashSet}; ...@@ -3,8 +3,9 @@ use std::collections::{HashMap, HashSet};
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use next_core::emit_assets; use next_core::emit_assets;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, trace::TraceRawVcs, Completion, FxIndexSet, RcStr, ResolvedVc, State, debug::ValueDebugFormat, trace::TraceRawVcs, Completion, FxIndexSet, ResolvedVc, State,
TryFlatJoinIterExt, TryJoinIterExt, ValueDefault, ValueToString, Vc, TryFlatJoinIterExt, TryJoinIterExt, ValueDefault, ValueToString, Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
......
use anyhow::Result; use anyhow::Result;
use serde::Serialize; use serde::Serialize;
use turbo_tasks::{FxIndexMap, FxIndexSet, RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, FxIndexSet, ResolvedVc, Vc};
use turbopack_browser::ecmascript::EcmascriptDevChunk; use turbopack_browser::ecmascript::EcmascriptDevChunk;
use turbopack_core::{ use turbopack_core::{
chunk::{Chunk, ChunkItem}, chunk::{Chunk, ChunkItem},
......
...@@ -21,6 +21,7 @@ tokio = { workspace = true, features = ["full"] } ...@@ -21,6 +21,7 @@ tokio = { workspace = true, features = ["full"] }
tokio-stream = "0.1.15" tokio-stream = "0.1.15"
tracing = "0.1" tracing = "0.1"
tracing-subscriber = "0.3" tracing-subscriber = "0.3"
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-env = { workspace = true } turbo-tasks-env = { workspace = true }
turbo-tasks-fs = { workspace = true } turbo-tasks-fs = { workspace = true }
......
...@@ -11,7 +11,8 @@ use next_api::{ ...@@ -11,7 +11,8 @@ use next_api::{
project::{ProjectContainer, ProjectOptions}, project::{ProjectContainer, ProjectOptions},
route::{Endpoint, Route}, route::{Endpoint, Route},
}; };
use turbo_tasks::{RcStr, ReadConsistency, TransientInstance, TurboTasks, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ReadConsistency, TransientInstance, TurboTasks, Vc};
use turbo_tasks_malloc::TurboMalloc; use turbo_tasks_malloc::TurboMalloc;
use turbo_tasks_memory::MemoryBackend; use turbo_tasks_memory::MemoryBackend;
......
...@@ -57,6 +57,7 @@ swc_core = { workspace = true, features = [ ...@@ -57,6 +57,7 @@ swc_core = { workspace = true, features = [
modularize_imports = { workspace = true } modularize_imports = { workspace = true }
swc_relay = { workspace = true } swc_relay = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-bytes = { workspace = true } turbo-tasks-bytes = { workspace = true }
turbo-tasks-env = { workspace = true } turbo-tasks-env = { workspace = true }
......
...@@ -4,7 +4,8 @@ use std::{ ...@@ -4,7 +4,8 @@ use std::{
}; };
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::{transition::Transition, ModuleAssetContext}; use turbopack::{transition::Transition, ModuleAssetContext};
use turbopack_core::{file_source::FileSource, module::Module}; use turbopack_core::{file_source::FileSource, module::Module};
......
...@@ -7,7 +7,8 @@ use swc_core::{ ...@@ -7,7 +7,8 @@ use swc_core::{
common::{source_map::SmallPos, Span, Spanned, GLOBALS}, common::{source_map::SmallPos, Span, Spanned, GLOBALS},
ecma::ast::{Decl, Expr, FnExpr, Ident, Program}, ecma::ast::{Decl, Expr, FnExpr, Ident, Program},
}; };
use turbo_tasks::{trace::TraceRawVcs, RcStr, TryJoinIterExt, ValueDefault, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, TryJoinIterExt, ValueDefault, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
file_source::FileSource, file_source::FileSource,
......
...@@ -5,9 +5,10 @@ use indexmap::map::{Entry, OccupiedEntry}; ...@@ -5,9 +5,10 @@ use indexmap::map::{Entry, OccupiedEntry};
use rustc_hash::FxHashMap; use rustc_hash::FxHashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, FxIndexMap, RcStr, ResolvedVc, debug::ValueDebugFormat, fxindexmap, trace::TraceRawVcs, FxIndexMap, ResolvedVc, TaskInput,
TaskInput, TryJoinIterExt, ValueDefault, ValueToString, Vc, TryJoinIterExt, ValueDefault, ValueToString, Vc,
}; };
use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath}; use turbo_tasks_fs::{DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath};
use turbopack_core::issue::{ use turbopack_core::issue::{
......
use anyhow::Result; use anyhow::Result;
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, ResolvedVc, Value, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::{transition::Transition, ModuleAssetContext}; use turbopack::{transition::Transition, ModuleAssetContext};
use turbopack_core::{ use turbopack_core::{
......
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbo_tasks_fs::{FileContent, FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileContent, FileSystem, FileSystemPath};
use turbopack_core::{file_source::FileSource, source::Source}; use turbopack_core::{file_source::FileSource, source::Source};
......
use std::io::Write; use std::io::Write;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{glob::Glob, rope::RopeBuilder}; use turbo_tasks_fs::{glob::Glob, rope::RopeBuilder};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
#[turbo_tasks::function] #[turbo_tasks::function]
pub async fn instrumentation_files(page_extensions: Vc<Vec<RcStr>>) -> Result<Vc<Vec<RcStr>>> { pub async fn instrumentation_files(page_extensions: Vc<Vec<RcStr>>) -> Result<Vc<Vec<RcStr>>> {
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{fxindexmap, FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{context::AssetContext, module::Module, reference_type::ReferenceType}; use turbopack_core::{context::AssetContext, module::Module, reference_type::ReferenceType};
......
use anyhow::Result; use anyhow::Result;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
FxIndexMap, RcStr, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Value, ValueToString, Vc, FxIndexMap, ResolvedVc, TryFlatJoinIterExt, TryJoinIterExt, Value, ValueToString, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
chunk::{availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt}, chunk::{availability_info::AvailabilityInfo, ChunkingContext, ChunkingContextExt},
......
use turbo_tasks::{RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::module::Module; use turbopack_core::module::Module;
use crate::app_segment_config::NextSegmentConfig; use crate::app_segment_config::NextSegmentConfig;
......
use std::io::Write; use std::io::Write;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{fxindexmap, RcStr, ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, ResolvedVc, TryJoinIterExt, Value, ValueToString, Vc};
use turbo_tasks_fs::{self, rope::RopeBuilder, File, FileSystemPath}; use turbo_tasks_fs::{self, rope::RopeBuilder, File, FileSystemPath};
use turbopack::ModuleAssetContext; use turbopack::ModuleAssetContext;
use turbopack_core::{ use turbopack_core::{
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{fxindexmap, RcStr, ResolvedVc, Value, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, ResolvedVc, Value, ValueToString, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::ModuleAssetContext; use turbopack::ModuleAssetContext;
use turbopack_core::{ use turbopack_core::{
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ResolvedVc, TryJoinIterExt, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, TryJoinIterExt, ValueToString, Vc};
use turbo_tasks_fs::glob::Glob; use turbo_tasks_fs::glob::Glob;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{RcStr, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ValueToString, Vc};
use turbo_tasks_fs::{File, FileContent, FileSystemPath}; use turbo_tasks_fs::{File, FileContent, FileSystemPath};
use turbo_tasks_hash::hash_xxh3_hash64; use turbo_tasks_hash::hash_xxh3_hash64;
use turbopack_core::{ use turbopack_core::{
......
...@@ -2,7 +2,8 @@ use std::{collections::HashMap, ops::Deref}; ...@@ -2,7 +2,8 @@ use std::{collections::HashMap, ops::Deref};
use anyhow::Result; use anyhow::Result;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use crate::next_app::{AppPage, PageSegment, PageType}; use crate::next_app::{AppPage, PageSegment, PageType};
......
...@@ -14,7 +14,8 @@ use std::{ ...@@ -14,7 +14,8 @@ use std::{
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, TaskInput}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, TaskInput};
pub use crate::next_app::{ pub use crate::next_app::{
app_client_references_chunks::{get_app_client_references_chunks, ClientReferencesChunks}, app_client_references_chunks::{get_app_client_references_chunks, ClientReferencesChunks},
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::resolve::{options::ImportMapping, ExternalType}; use turbopack_core::resolve::{options::ImportMapping, ExternalType};
......
use std::iter::once; use std::iter::once;
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_env::EnvMap; use turbo_tasks_env::EnvMap;
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack::{ use turbopack::{
......
#![allow(rustdoc::private_intra_doc_links)] #![allow(rustdoc::private_intra_doc_links)]
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
ident::AssetIdent, ident::AssetIdent,
......
...@@ -2,7 +2,8 @@ use std::{io::Write, iter::once}; ...@@ -2,7 +2,8 @@ use std::{io::Write, iter::once};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use indoc::writedoc; use indoc::writedoc;
use turbo_tasks::{RcStr, Value, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{Value, ValueToString, Vc};
use turbo_tasks_fs::File; use turbo_tasks_fs::File;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, Vc};
use turbopack::{ use turbopack::{
transition::{ContextTransition, Transition}, transition::{ContextTransition, Transition},
ModuleAssetContext, ModuleAssetContext,
......
...@@ -3,11 +3,12 @@ use std::{collections::HashSet, future::Future}; ...@@ -3,11 +3,12 @@ use std::{collections::HashSet, future::Future};
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
debug::ValueDebugFormat, debug::ValueDebugFormat,
graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow, VisitedNodes}, graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow, VisitedNodes},
trace::TraceRawVcs, trace::TraceRawVcs,
FxIndexMap, FxIndexSet, RcStr, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc, FxIndexMap, FxIndexSet, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc,
}; };
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::css::CssModuleAsset; use turbopack::css::CssModuleAsset;
......
...@@ -3,7 +3,8 @@ use std::collections::HashSet; ...@@ -3,7 +3,8 @@ use std::collections::HashSet;
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use serde::{Deserialize, Deserializer, Serialize}; use serde::{Deserialize, Deserializer, Serialize};
use serde_json::Value as JsonValue; use serde_json::Value as JsonValue;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, RcStr, ResolvedVc, TaskInput, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, ResolvedVc, TaskInput, Vc};
use turbo_tasks_env::EnvMap; use turbo_tasks_env::EnvMap;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::{ use turbopack::module_options::{
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
chunk::{ChunkableModule, ChunkingContext, ChunkingContextExt}, chunk::{ChunkableModule, ChunkingContext, ChunkingContextExt},
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, Vc};
use turbopack::{transition::Transition, ModuleAssetContext}; use turbopack::{transition::Transition, ModuleAssetContext};
use turbopack_core::{context::ProcessResult, reference_type::ReferenceType, source::Source}; use turbopack_core::{context::ProcessResult, reference_type::ReferenceType, source::Source};
......
...@@ -2,9 +2,10 @@ use std::future::Future; ...@@ -2,9 +2,10 @@ use std::future::Future;
use anyhow::Result; use anyhow::Result;
use tracing::Instrument; use tracing::Instrument;
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow}, graph::{AdjacencyMap, GraphTraversal, Visit, VisitControlFlow},
RcStr, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc, ReadRef, ResolvedVc, TryJoinIterExt, ValueToString, Vc,
}; };
use turbopack_core::{ use turbopack_core::{
module::{Module, Modules}, module::{Module, Modules},
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_env::EnvMap; use turbo_tasks_env::EnvMap;
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::resolve_options_context::ResolveOptionsContext; use turbopack::resolve_options_context::ResolveOptionsContext;
......
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{fxindexmap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{File, FileSystemPath}; use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, context::AssetContext, module::Module, reference_type::ReferenceType, asset::AssetContent, context::AssetContext, module::Module, reference_type::ReferenceType,
......
use anyhow::Result; use anyhow::Result;
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, Vc};
pub(crate) struct DefaultFallbackFont { pub(crate) struct DefaultFallbackFont {
pub name: RcStr, pub name: RcStr,
......
...@@ -4,7 +4,8 @@ use anyhow::{Context, Result}; ...@@ -4,7 +4,8 @@ use anyhow::{Context, Result};
use once_cell::sync::Lazy; use once_cell::sync::Lazy;
use regex::Regex; use regex::Regex;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::issue::{IssueExt, IssueSeverity, StyledString}; use turbopack_core::issue::{IssueExt, IssueSeverity, StyledString};
......
...@@ -4,7 +4,8 @@ use anyhow::{bail, Context, Result}; ...@@ -4,7 +4,8 @@ use anyhow::{bail, Context, Result};
use futures::FutureExt; use futures::FutureExt;
use indoc::formatdoc; use indoc::formatdoc;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{Completion, FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{Completion, FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_bytes::stream::SingleValue; use turbo_tasks_bytes::stream::SingleValue;
use turbo_tasks_env::{CommandLineProcessEnv, ProcessEnv}; use turbo_tasks_env::{CommandLineProcessEnv, ProcessEnv};
use turbo_tasks_fetch::{fetch, HttpResponseBody}; use turbo_tasks_fetch::{fetch, HttpResponseBody};
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{fxindexset, trace::TraceRawVcs, FxIndexMap, FxIndexSet, RcStr, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexset, trace::TraceRawVcs, FxIndexMap, FxIndexSet, Value, Vc};
use super::request::{NextFontRequest, OneOrManyStrings}; use super::request::{NextFontRequest, OneOrManyStrings};
...@@ -200,7 +201,8 @@ pub(super) fn options_from_request( ...@@ -200,7 +201,8 @@ pub(super) fn options_from_request(
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr}; use turbo_rcstr::RcStr;
use turbo_tasks::FxIndexMap;
use turbo_tasks_fs::json::parse_json_with_source_context; use turbo_tasks_fs::json::parse_json_with_source_context;
use super::{options_from_request, FontDataEntry, NextFontGoogleOptions}; use super::{options_from_request, FontDataEntry, NextFontGoogleOptions};
......
use serde::Deserialize; use serde::Deserialize;
use turbo_tasks::RcStr; use turbo_rcstr::RcStr;
/// The top-most structure encoded into the query param in requests to /// The top-most structure encoded into the query param in requests to
/// `next/font/google` generated by the next/font swc transform. e.g. /// `next/font/google` generated by the next/font swc transform. e.g.
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use super::FontCssProperties; use super::FontCssProperties;
use crate::next_font::{ use crate::next_font::{
......
use std::{cmp::Ordering, collections::BTreeSet}; use std::{cmp::Ordering, collections::BTreeSet};
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use turbo_tasks::{FxIndexSet, RcStr}; use turbo_rcstr::RcStr;
use turbo_tasks::FxIndexSet;
use super::options::{FontData, FontWeights}; use super::options::{FontData, FontWeights};
......
use thiserror::Error; use thiserror::Error;
use turbo_tasks::RcStr; use turbo_rcstr::RcStr;
#[derive(Debug, Error)] #[derive(Debug, Error)]
pub enum FontError { pub enum FontError {
......
...@@ -254,7 +254,7 @@ fn parse_weight_string(weight_str: &str) -> Result<f64> { ...@@ -254,7 +254,7 @@ fn parse_weight_string(weight_str: &str) -> Result<f64> {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use anyhow::Result; use anyhow::Result;
use turbo_tasks::RcStr; use turbo_rcstr::RcStr;
use crate::next_font::local::{ use crate::next_font::local::{
font_fallback::pick_font_for_fallback_generation, font_fallback::pick_font_for_fallback_generation,
......
use anyhow::{bail, Context, Result}; use anyhow::{bail, Context, Result};
use indoc::formatdoc; use indoc::formatdoc;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
glob::Glob, json::parse_json_with_source_context, FileContent, FileSystemPath, glob::Glob, json::parse_json_with_source_context, FileContent, FileSystemPath,
}; };
......
...@@ -2,7 +2,8 @@ use std::{fmt::Display, str::FromStr}; ...@@ -2,7 +2,8 @@ use std::{fmt::Display, str::FromStr};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, Value, Vc};
use super::request::{ use super::request::{
AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor, AdjustFontFallback, NextFontLocalRequest, NextFontLocalRequestArguments, SrcDescriptor,
......
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr}; use turbo_rcstr::RcStr;
use turbo_tasks::trace::TraceRawVcs;
/// The top-most structure encoded into the query param in requests to /// The top-most structure encoded into the query param in requests to
/// `next/font/local` generated by the next/font swc transform. e.g. /// `next/font/local` generated by the next/font swc transform. e.g.
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use super::options::{FontDescriptors, NextFontLocalOptions}; use super::options::{FontDescriptors, NextFontLocalOptions};
use crate::next_font::{ use crate::next_font::{
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use super::options::NextFontLocalOptions; use super::options::NextFontLocalOptions;
use crate::next_font::{ use crate::next_font::{
......
use anyhow::Result; use anyhow::Result;
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use super::{ use super::{
font_fallback::{FontFallback, FontFallbacks}, font_fallback::{FontFallback, FontFallbacks},
......
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use serde::Deserialize; use serde::Deserialize;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbo_tasks_fs::{json::parse_json_with_source_context, FileSystemPath}; use turbo_tasks_fs::{json::parse_json_with_source_context, FileSystemPath};
use turbo_tasks_hash::hash_xxh3_hash64; use turbo_tasks_hash::hash_xxh3_hash64;
use turbopack_core::issue::{IssueExt, IssueSeverity, StyledString}; use turbopack_core::issue::{IssueExt, IssueSeverity, StyledString};
......
use std::io::Write; use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbo_tasks_fs::{rope::RopeBuilder, FileContent}; use turbo_tasks_fs::{rope::RopeBuilder, FileContent};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
use std::collections::{BTreeMap, HashMap}; use std::collections::{BTreeMap, HashMap};
use anyhow::{Context, Result}; use anyhow::{Context, Result};
use turbo_tasks::{fxindexmap, FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
reference_type::{CommonJsReferenceSubType, ReferenceType}, reference_type::{CommonJsReferenceSubType, ReferenceType},
......
use anyhow::Result; use anyhow::Result;
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{RcStr, TryJoinIterExt, Value, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{TryJoinIterExt, Value, ValueToString, Vc};
use turbo_tasks_fs::{File, FileSystemPath}; use turbo_tasks_fs::{File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::AssetContent, asset::AssetContent,
......
...@@ -5,7 +5,8 @@ pub(crate) mod client_reference_manifest; ...@@ -5,7 +5,8 @@ pub(crate) mod client_reference_manifest;
use std::collections::HashMap; use std::collections::HashMap;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, FxIndexSet, RcStr, TaskInput}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, FxIndexMap, FxIndexSet, TaskInput};
use crate::next_config::{CrossOriginConfig, Rewrites, RouteHas}; use crate::next_config::{CrossOriginConfig, Rewrites, RouteHas};
......
...@@ -2,7 +2,8 @@ use std::io::Write; ...@@ -2,7 +2,8 @@ use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use serde::Serialize; use serde::Serialize;
use turbo_tasks::{fxindexmap, FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{rope::RopeBuilder, File, FileSystemPath}; use turbo_tasks_fs::{rope::RopeBuilder, File, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbopack_node::route_matcher::{Params, RouteMatcher, RouteMatcherRef}; use turbopack_node::route_matcher::{Params, RouteMatcher, RouteMatcherRef};
use self::{ use self::{
......
use std::iter::once; use std::iter::once;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, ResolvedVc, Value, Vc};
use turbo_tasks_env::{EnvMap, ProcessEnv}; use turbo_tasks_env::{EnvMap, ProcessEnv};
use turbo_tasks_fs::{FileSystem, FileSystemPath}; use turbo_tasks_fs::{FileSystem, FileSystemPath};
use turbopack::{ use turbopack::{
......
use anyhow::Result; use anyhow::Result;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use turbo_tasks::{trace::TraceRawVcs, RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{trace::TraceRawVcs, ResolvedVc, Value, Vc};
use turbo_tasks_fs::{self, glob::Glob, FileJsonContent, FileSystemPath}; use turbo_tasks_fs::{self, glob::Glob, FileJsonContent, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString}, issue::{Issue, IssueExt, IssueSeverity, IssueStage, OptionStyledString, StyledString},
......
...@@ -2,7 +2,8 @@ use std::collections::BTreeMap; ...@@ -2,7 +2,8 @@ use std::collections::BTreeMap;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use indoc::formatdoc; use indoc::formatdoc;
use turbo_tasks::{RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::{ use turbopack_core::{
asset::{Asset, AssetContent}, asset::{Asset, AssetContent},
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbopack_core::{ use turbopack_core::{
chunk::ChunkableModuleReference, module::Module, reference::ModuleReference, chunk::ChunkableModuleReference, module::Module, reference::ModuleReference,
resolve::ModuleResolveResult, resolve::ModuleResolveResult,
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use turbopack::{transition::Transition, ModuleAssetContext}; use turbopack::{transition::Transition, ModuleAssetContext};
use turbopack_core::module::Module; use turbopack_core::module::Module;
use turbopack_ecmascript::chunk::EcmascriptChunkPlaceable; use turbopack_ecmascript::chunk::EcmascriptChunkPlaceable;
......
...@@ -2,7 +2,8 @@ use std::collections::HashMap; ...@@ -2,7 +2,8 @@ use std::collections::HashMap;
use anyhow::Result; use anyhow::Result;
use lazy_static::lazy_static; use lazy_static::lazy_static;
use turbo_tasks::{RcStr, ResolvedVc, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Value, Vc};
use turbo_tasks_fs::{glob::Glob, FileSystemPath}; use turbo_tasks_fs::{glob::Glob, FileSystemPath};
use turbopack_core::{ use turbopack_core::{
diagnostics::DiagnosticExt, diagnostics::DiagnosticExt,
......
use anyhow::Result; use anyhow::Result;
#[allow(unused_imports)] #[allow(unused_imports)]
use turbo_tasks::RcStr; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc}; use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::ModuleRule; use turbopack::module_options::ModuleRule;
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, ResolvedVc, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack::module_options::WebpackLoadersOptions; use turbopack::module_options::WebpackLoadersOptions;
use turbopack_core::resolve::options::ImportMapping; use turbopack_core::resolve::options::ImportMapping;
......
use turbo_tasks::{fxindexmap, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, Vc};
use turbopack_core::diagnostics::{Diagnostic, DiagnosticPayload}; use turbopack_core::diagnostics::{Diagnostic, DiagnosticPayload};
/// A structure that keeps track of whether a particular Next.js feature is /// A structure that keeps track of whether a particular Next.js feature is
......
use std::io::Write; use std::io::Write;
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use turbo_tasks::{fxindexmap, RcStr, TryJoinIterExt, Value, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{fxindexmap, TryJoinIterExt, Value, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
self, rope::RopeBuilder, File, FileContent, FileSystemPath, FileSystemPathOption, self, rope::RopeBuilder, File, FileContent, FileSystemPath, FileSystemPathOption,
}; };
......
use anyhow::Result; use anyhow::Result;
use tracing::Instrument; use tracing::Instrument;
use turbo_tasks::{RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath, FileSystemPathOption, DirectoryContent, DirectoryEntry, FileSystemEntryType, FileSystemPath, FileSystemPathOption,
}; };
......
...@@ -4,9 +4,10 @@ use swc_core::{ ...@@ -4,9 +4,10 @@ use swc_core::{
common::GLOBALS, common::GLOBALS,
ecma::ast::{Expr, Lit, Program}, ecma::ast::{Expr, Lit, Program},
}; };
use turbo_rcstr::RcStr;
use turbo_tasks::{ use turbo_tasks::{
trace::TraceRawVcs, FxIndexMap, FxIndexSet, RcStr, ResolvedVc, TaskInput, ValueDefault, trace::TraceRawVcs, FxIndexMap, FxIndexSet, ResolvedVc, TaskInput, ValueDefault, ValueToString,
ValueToString, Vc, Vc,
}; };
use turbo_tasks_fs::{ use turbo_tasks_fs::{
self, json::parse_json_rope_with_source_context, rope::Rope, util::join_path, File, self, json::parse_json_rope_with_source_context, rope::Rope, util::join_path, File,
......
[package]
name = "turbo-rcstr"
version = "0.1.0"
edition = "2021"
license = "MIT"
[dependencies]
triomphe = { workspace = true }
turbo-tasks-hash = { workspace = true }
serde = { workspace = true }
[lints]
workspace = true
...@@ -10,8 +10,6 @@ use serde::{Deserialize, Serialize}; ...@@ -10,8 +10,6 @@ use serde::{Deserialize, Serialize};
use triomphe::Arc; use triomphe::Arc;
use turbo_tasks_hash::{DeterministicHash, DeterministicHasher}; use turbo_tasks_hash::{DeterministicHash, DeterministicHasher};
use crate::debug::{ValueDebugFormat, ValueDebugFormatString};
/// An immutable reference counted [`String`], similar to [`Arc<String>`][std::sync::Arc]. /// An immutable reference counted [`String`], similar to [`Arc<String>`][std::sync::Arc].
/// ///
/// This is the preferred immutable string type for [`turbo_task::function`][macro@crate::function] /// This is the preferred immutable string type for [`turbo_task::function`][macro@crate::function]
...@@ -27,7 +25,7 @@ use crate::debug::{ValueDebugFormat, ValueDebugFormatString}; ...@@ -27,7 +25,7 @@ use crate::debug::{ValueDebugFormat, ValueDebugFormatString};
/// `RcStr::from(...)`: /// `RcStr::from(...)`:
/// ///
/// ``` /// ```
/// # use turbo_tasks::RcStr; /// # use turbo_rcstr::RcStr;
/// # /// #
/// let s = "foo"; /// let s = "foo";
/// let rc_s1: RcStr = s.into(); /// let rc_s1: RcStr = s.into();
...@@ -181,9 +179,3 @@ impl From<RcStr> for PathBuf { ...@@ -181,9 +179,3 @@ impl From<RcStr> for PathBuf {
String::from(s).into() String::from(s).into()
} }
} }
impl ValueDebugFormat for RcStr {
fn value_debug_format(&self, _: usize) -> ValueDebugFormatString {
ValueDebugFormatString::Sync(self.to_string())
}
}
...@@ -42,6 +42,7 @@ tokio-scoped = "0.2.0" ...@@ -42,6 +42,7 @@ tokio-scoped = "0.2.0"
tracing = { workspace = true } tracing = { workspace = true }
thread_local = { workspace = true } thread_local = { workspace = true }
turbo-prehash = { workspace = true } turbo-prehash = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-hash = { workspace = true } turbo-tasks-hash = { workspace = true }
turbo-tasks-malloc = { workspace = true, default-features = false } turbo-tasks-malloc = { workspace = true, default-features = false }
......
...@@ -16,6 +16,7 @@ anyhow = { workspace = true } ...@@ -16,6 +16,7 @@ anyhow = { workspace = true }
dotenvs = "0.1.0" dotenvs = "0.1.0"
indexmap = { workspace = true, features = ["serde"] } indexmap = { workspace = true, features = ["serde"] }
serde = { workspace = true } serde = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-fs = { workspace = true } turbo-tasks-fs = { workspace = true }
......
use turbo_tasks::{mark_session_dependent, FxIndexMap, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{mark_session_dependent, FxIndexMap, Vc};
use crate::{sorted_env_vars, EnvMap, ProcessEnv, GLOBAL_ENV_LOCK}; use crate::{sorted_env_vars, EnvMap, ProcessEnv, GLOBAL_ENV_LOCK};
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::Vc;
use crate::{case_insensitive_read, EnvMap, ProcessEnv}; use crate::{case_insensitive_read, EnvMap, ProcessEnv};
......
use std::{env, sync::MutexGuard}; use std::{env, sync::MutexGuard};
use anyhow::{anyhow, Context, Result}; use anyhow::{anyhow, Context, Result};
use turbo_tasks::{FxIndexMap, RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, ResolvedVc, ValueToString, Vc};
use turbo_tasks_fs::{FileContent, FileSystemPath}; use turbo_tasks_fs::{FileContent, FileSystemPath};
use crate::{sorted_env_vars, EnvMap, ProcessEnv, GLOBAL_ENV_LOCK}; use crate::{sorted_env_vars, EnvMap, ProcessEnv, GLOBAL_ENV_LOCK};
......
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, Vc};
use crate::{EnvMap, ProcessEnv}; use crate::{EnvMap, ProcessEnv};
......
...@@ -9,7 +9,8 @@ mod filter; ...@@ -9,7 +9,8 @@ mod filter;
use std::{env, sync::Mutex}; use std::{env, sync::Mutex};
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{FxIndexMap, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{FxIndexMap, Vc};
pub use self::{ pub use self::{
command_line::CommandLineProcessEnv, custom::CustomProcessEnv, dotenv::DotenvProcessEnv, command_line::CommandLineProcessEnv, custom::CustomProcessEnv, dotenv::DotenvProcessEnv,
......
...@@ -28,6 +28,7 @@ anyhow = { workspace = true } ...@@ -28,6 +28,7 @@ anyhow = { workspace = true }
reqwest = { workspace = true } reqwest = { workspace = true }
serde = { workspace = true } serde = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-fs = { workspace = true } turbo-tasks-fs = { workspace = true }
turbopack-core = { workspace = true } turbopack-core = { workspace = true }
......
...@@ -3,7 +3,8 @@ ...@@ -3,7 +3,8 @@
#![feature(arbitrary_self_types_pointers)] #![feature(arbitrary_self_types_pointers)]
use anyhow::Result; use anyhow::Result;
use turbo_tasks::{mark_session_dependent, RcStr, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{mark_session_dependent, Vc};
use turbo_tasks_fs::FileSystemPath; use turbo_tasks_fs::FileSystemPath;
use turbopack_core::issue::{Issue, IssueSeverity, IssueStage, OptionStyledString, StyledString}; use turbopack_core::issue::{Issue, IssueSeverity, IssueStage, OptionStyledString, StyledString};
......
...@@ -46,6 +46,7 @@ serde_json = { workspace = true } ...@@ -46,6 +46,7 @@ serde_json = { workspace = true }
serde_path_to_error = { workspace = true } serde_path_to_error = { workspace = true }
tokio = { workspace = true } tokio = { workspace = true }
tracing = { workspace = true } tracing = { workspace = true }
turbo-rcstr = { workspace = true }
turbo-tasks = { workspace = true } turbo-tasks = { workspace = true }
turbo-tasks-hash = { workspace = true } turbo-tasks-hash = { workspace = true }
unicode-segmentation = { workspace = true } unicode-segmentation = { workspace = true }
......
...@@ -10,7 +10,8 @@ use std::{ ...@@ -10,7 +10,8 @@ use std::{
use anyhow::Result; use anyhow::Result;
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use turbo_tasks::{util::FormatDuration, RcStr, ReadConsistency, TurboTasks, UpdateInfo, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{util::FormatDuration, ReadConsistency, TurboTasks, UpdateInfo, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
register, DirectoryContent, DirectoryEntry, DiskFileSystem, FileContent, FileSystem, register, DirectoryContent, DirectoryEntry, DiskFileSystem, FileContent, FileSystem,
FileSystemPath, FileSystemPath,
......
...@@ -10,7 +10,8 @@ use std::{ ...@@ -10,7 +10,8 @@ use std::{
use anyhow::Result; use anyhow::Result;
use sha2::{Digest, Sha256}; use sha2::{Digest, Sha256};
use turbo_tasks::{util::FormatDuration, RcStr, ReadConsistency, TurboTasks, UpdateInfo, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{util::FormatDuration, ReadConsistency, TurboTasks, UpdateInfo, Vc};
use turbo_tasks_fs::{ use turbo_tasks_fs::{
glob::Glob, register, DirectoryEntry, DiskFileSystem, FileContent, FileSystem, FileSystemPath, glob::Glob, register, DirectoryEntry, DiskFileSystem, FileContent, FileSystem, FileSystemPath,
ReadGlobResult, ReadGlobResult,
......
use anyhow::{bail, Result}; use anyhow::{bail, Result};
use auto_hash_map::AutoMap; use auto_hash_map::AutoMap;
use turbo_tasks::{Completion, RcStr, ResolvedVc, ValueToString, Vc}; use turbo_rcstr::RcStr;
use turbo_tasks::{Completion, ResolvedVc, ValueToString, Vc};
use crate::{ use crate::{
DirectoryContent, DirectoryEntry, FileContent, FileMeta, FileSystem, FileSystemPath, DirectoryContent, DirectoryEntry, FileContent, FileMeta, FileSystem, FileSystemPath,
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment