From 92e3635457cde9dc37a5de31f4a5594f1cd80dc0 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Sat, 17 Feb 2024 03:31:07 +0100 Subject: [PATCH 01/11] chore: remove unused rust dependencies --- .cargo/config.toml | 19 +++-- crates/tower-uds/Cargo.toml | 1 - crates/turbo-tasks-bytes/Cargo.toml | 1 - crates/turbo-tasks-fetch/Cargo.toml | 1 - crates/turbo-tasks-macros/Cargo.toml | 1 - crates/turbo-tasks/Cargo.toml | 1 - crates/turbopack-bench/Cargo.toml | 6 -- crates/turbopack-browser/Cargo.toml | 3 - crates/turbopack-cli-utils/Cargo.toml | 1 - crates/turbopack-cli/Cargo.toml | 5 +- crates/turbopack-core/Cargo.toml | 2 - crates/turbopack-css/Cargo.toml | 2 - crates/turbopack-dev-server/Cargo.toml | 1 - .../turbopack-ecmascript-plugins/Cargo.toml | 1 - .../turbopack-ecmascript-runtime/Cargo.toml | 2 - crates/turbopack-ecmascript/Cargo.toml | 3 - crates/turbopack-image/Cargo.toml | 1 - crates/turbopack-node/Cargo.toml | 1 - crates/turbopack-nodejs/Cargo.toml | 4 - crates/turbopack-trace-server/Cargo.toml | 4 - crates/turbopack-wasm/Cargo.toml | 1 - crates/turbopack/Cargo.toml | 2 - crates/turborepo-auth/Cargo.toml | 1 - crates/turborepo-cache/Cargo.toml | 6 -- crates/turborepo-env/Cargo.toml | 1 - crates/turborepo-filewatch/Cargo.toml | 2 - crates/turborepo-globwatch/Cargo.toml | 4 - crates/turborepo-lib/Cargo.toml | 83 ++++++++----------- crates/turborepo-lsp/Cargo.toml | 6 -- crates/turborepo-telemetry/Cargo.toml | 2 - crates/turborepo-ui/Cargo.toml | 5 +- crates/turborepo-vercel-api-mock/Cargo.toml | 1 - crates/turborepo/Cargo.toml | 11 --- 33 files changed, 46 insertions(+), 139 deletions(-) diff --git a/.cargo/config.toml b/.cargo/config.toml index 9f2f0965b0174..aed6b4bfce1a7 100644 --- a/.cargo/config.toml +++ b/.cargo/config.toml @@ -3,12 +3,21 @@ CARGO_WORKSPACE_DIR = { value = "", relative = true } TURBO_PNPM_WORKSPACE_DIR = { value = "", relative = true } [build] -rustflags = ["--cfg", "tokio_unstable"] +rustflags = [ + "--cfg", + "tokio_unstable", + "-Zshare-generics=y", # make the current crate share its generic instantiations + "-Zthreads=8", # parallel frontend https://blog.rust-lang.org/2023/11/09/parallel-rustc.html + "-Csymbol-mangling-version=v0", +] rustdocflags = ["-Znormalize-docs"] [target.x86_64-pc-windows-msvc] linker = "rust-lld" +[target.aarch64-apple-darwin] +linker = "rust-lld" + [alias] xtask = "run --package xtask --" tr-build = "build -p turbo" @@ -21,11 +30,3 @@ tp-test = "nextest run --workspace --release --no-fail-fast --exclude turbo --ex tp-bench-test = "test --benches --workspace --release --no-fail-fast --exclude turbopack-bench --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" tp-check = "check --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" tp-clippy = "clippy --workspace --exclude turbo --exclude turborepo-* --exclude turbopath --exclude wax --exclude globwalk --exclude globwatch --exclude pidlock" - -[target.'cfg(all())'] -rustflags = [ - "--cfg", - "tokio_unstable", - "-Zshare-generics=y", - "-Csymbol-mangling-version=v0", -] diff --git a/crates/tower-uds/Cargo.toml b/crates/tower-uds/Cargo.toml index 35b12062e32c3..451fea5c71a18 100644 --- a/crates/tower-uds/Cargo.toml +++ b/crates/tower-uds/Cargo.toml @@ -7,7 +7,6 @@ license = "MPL-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -http = "0.2.11" tokio = { workspace = true, features = ["net"] } tower = { version = "0.4.13", features = ["util"] } diff --git a/crates/turbo-tasks-bytes/Cargo.toml b/crates/turbo-tasks-bytes/Cargo.toml index 2985b22142753..657a9ebcdca38 100644 --- a/crates/turbo-tasks-bytes/Cargo.toml +++ b/crates/turbo-tasks-bytes/Cargo.toml @@ -17,7 +17,6 @@ bytes = { workspace = true } futures = { workspace = true } serde = { workspace = true } serde_bytes = "0.11.9" -tokio = { workspace = true } turbo-tasks = { workspace = true } [dev-dependencies] diff --git a/crates/turbo-tasks-fetch/Cargo.toml b/crates/turbo-tasks-fetch/Cargo.toml index 1fa1a5f58dd6c..a26f541154e2b 100644 --- a/crates/turbo-tasks-fetch/Cargo.toml +++ b/crates/turbo-tasks-fetch/Cargo.toml @@ -20,7 +20,6 @@ workspace = true [dependencies] anyhow = { workspace = true } -indexmap = { workspace = true } lazy_static = { workspace = true } reqwest = { workspace = true } serde = { workspace = true } diff --git a/crates/turbo-tasks-macros/Cargo.toml b/crates/turbo-tasks-macros/Cargo.toml index d21b91e151f09..984ad25fbe8d3 100644 --- a/crates/turbo-tasks-macros/Cargo.toml +++ b/crates/turbo-tasks-macros/Cargo.toml @@ -14,7 +14,6 @@ workspace = true [dependencies] anyhow = { workspace = true } -convert_case = "0.6.0" proc-macro-error = "1.0.4" proc-macro2 = { workspace = true } quote = { workspace = true } diff --git a/crates/turbo-tasks/Cargo.toml b/crates/turbo-tasks/Cargo.toml index 6ceccb0af21da..330affe279574 100644 --- a/crates/turbo-tasks/Cargo.toml +++ b/crates/turbo-tasks/Cargo.toml @@ -37,7 +37,6 @@ regex = { workspace = true } serde = { workspace = true, features = ["rc", "derive"] } serde_json = { workspace = true } serde_regex = "1.1.0" -stable_deref_trait = "1.2.0" thiserror = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true } diff --git a/crates/turbopack-bench/Cargo.toml b/crates/turbopack-bench/Cargo.toml index 3ecb2495619f7..3646b0bba790e 100644 --- a/crates/turbopack-bench/Cargo.toml +++ b/crates/turbopack-bench/Cargo.toml @@ -21,19 +21,14 @@ anyhow = { workspace = true, features = ["backtrace"] } chromiumoxide = { workspace = true, features = [ "tokio-runtime", ], default-features = false } -clap = { workspace = true, features = ["derive", "env"], optional = true } -console-subscriber = { workspace = true, optional = true } criterion = { workspace = true, features = ["async_tokio"] } -dunce = { workspace = true } futures = { workspace = true } -mime = { workspace = true } once_cell = { workspace = true } owo-colors = { workspace = true } parking_lot = { workspace = true } portpicker = "0.1.1" rand = { workspace = true } regex = { workspace = true } -serde = { workspace = true } serde_json = { workspace = true } tempfile = { workspace = true } tokio = { workspace = true, features = ["full"] } @@ -42,7 +37,6 @@ turbo-tasks = { workspace = true } turbo-tasks-testing = { workspace = true } turbopack-create-test-app = { workspace = true } url = { workspace = true } -webbrowser = { workspace = true } [target.'cfg(unix)'.dependencies] nix = "0.26.1" diff --git a/crates/turbopack-browser/Cargo.toml b/crates/turbopack-browser/Cargo.toml index 75e8a2b8504bb..44e1224610e41 100644 --- a/crates/turbopack-browser/Cargo.toml +++ b/crates/turbopack-browser/Cargo.toml @@ -33,12 +33,9 @@ turbo-tasks-fs = { workspace = true } turbo-tasks-hash = { workspace = true } turbopack = { workspace = true } turbopack-core = { workspace = true } -turbopack-css = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-ecmascript-runtime = { workspace = true } turbopack-resolve = { workspace = true } -swc_core = { workspace = true } - [build-dependencies] turbo-tasks-build = { workspace = true } diff --git a/crates/turbopack-cli-utils/Cargo.toml b/crates/turbopack-cli-utils/Cargo.toml index 50893bb4c21dc..68e90ae3c3b12 100644 --- a/crates/turbopack-cli-utils/Cargo.toml +++ b/crates/turbopack-cli-utils/Cargo.toml @@ -18,7 +18,6 @@ workspace = true anyhow = { workspace = true } clap = { workspace = true, features = ["derive"] } crossterm = "0.26.0" -once_cell = { workspace = true } owo-colors = { workspace = true } serde = { workspace = true, features = ["derive"] } turbo-tasks = { workspace = true } diff --git a/crates/turbopack-cli/Cargo.toml b/crates/turbopack-cli/Cargo.toml index 1b5579bb23481..59eba5c7ad509 100644 --- a/crates/turbopack-cli/Cargo.toml +++ b/crates/turbopack-cli/Cargo.toml @@ -42,16 +42,12 @@ workspace = true anyhow = { workspace = true, features = ["backtrace"] } clap = { workspace = true, features = ["derive", "env"] } console-subscriber = { workspace = true, optional = true } -criterion = { workspace = true, features = ["async_tokio"] } dunce = { workspace = true } futures = { workspace = true } mime = { workspace = true } -once_cell = { workspace = true } owo-colors = { workspace = true } serde = { workspace = true } -serde_json = { workspace = true } tokio = { workspace = true, features = ["full"] } -tracing = { workspace = true } tracing-subscriber = { workspace = true, features = ["env-filter", "json"] } turbo-tasks = { workspace = true } turbo-tasks-env = { workspace = true } @@ -76,6 +72,7 @@ turbopack-trace-utils = { workspace = true } webbrowser = { workspace = true } [dev-dependencies] +criterion = { workspace = true, features = ["async_tokio"] } regex = { workspace = true } turbopack-bench = { workspace = true } diff --git a/crates/turbopack-core/Cargo.toml b/crates/turbopack-core/Cargo.toml index 5173ed6177317..a5d30aae00ee5 100644 --- a/crates/turbopack-core/Cargo.toml +++ b/crates/turbopack-core/Cargo.toml @@ -23,12 +23,10 @@ indexmap = { workspace = true } lazy_static = { workspace = true } once_cell = { workspace = true } patricia_tree = "0.5.5" -qstring = { workspace = true } ref-cast = "1.0.20" regex = { workspace = true } serde = { workspace = true, features = ["rc"] } serde_json = { workspace = true, features = ["preserve_order"] } -serde_qs = { workspace = true } sourcemap = { workspace = true } swc_core = { workspace = true, features = ["ecma_preset_env", "common"] } tracing = { workspace = true } diff --git a/crates/turbopack-css/Cargo.toml b/crates/turbopack-css/Cargo.toml index f6f3c6dd45f32..dfab81efe800c 100644 --- a/crates/turbopack-css/Cargo.toml +++ b/crates/turbopack-css/Cargo.toml @@ -14,12 +14,10 @@ workspace = true [dependencies] anyhow = { workspace = true } -async-trait = { workspace = true } indexmap = { workspace = true } indoc = { workspace = true } lightningcss = { workspace = true } once_cell = { workspace = true } -parcel_selectors = { workspace = true } regex = { workspace = true } serde = { workspace = true } urlencoding = { workspace = true } diff --git a/crates/turbopack-dev-server/Cargo.toml b/crates/turbopack-dev-server/Cargo.toml index 24be925ba4625..99d581864d192 100644 --- a/crates/turbopack-dev-server/Cargo.toml +++ b/crates/turbopack-dev-server/Cargo.toml @@ -25,7 +25,6 @@ hyper-tungstenite = "0.9.0" indexmap = { workspace = true, features = ["serde"] } mime = { workspace = true } mime_guess = "2.0.4" -once_cell = { workspace = true } parking_lot = { workspace = true } pin-project-lite = { workspace = true } serde = { workspace = true } diff --git a/crates/turbopack-ecmascript-plugins/Cargo.toml b/crates/turbopack-ecmascript-plugins/Cargo.toml index dccd8a3664c4d..d55d6586cae28 100644 --- a/crates/turbopack-ecmascript-plugins/Cargo.toml +++ b/crates/turbopack-ecmascript-plugins/Cargo.toml @@ -26,7 +26,6 @@ anyhow = { workspace = true } async-trait = { workspace = true } indexmap = { workspace = true } lightningcss = { workspace = true } -parcel_selectors = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } diff --git a/crates/turbopack-ecmascript-runtime/Cargo.toml b/crates/turbopack-ecmascript-runtime/Cargo.toml index 0a2dd0da02109..a9899deabda2c 100644 --- a/crates/turbopack-ecmascript-runtime/Cargo.toml +++ b/crates/turbopack-ecmascript-runtime/Cargo.toml @@ -29,7 +29,5 @@ turbopack = { workspace = true } turbopack-core = { workspace = true } turbopack-ecmascript = { workspace = true } -swc_core = { workspace = true } - [build-dependencies] turbo-tasks-build = { workspace = true } diff --git a/crates/turbopack-ecmascript/Cargo.toml b/crates/turbopack-ecmascript/Cargo.toml index 9c33de0490a83..105d36b868d8d 100644 --- a/crates/turbopack-ecmascript/Cargo.toml +++ b/crates/turbopack-ecmascript/Cargo.toml @@ -16,7 +16,6 @@ workspace = true anyhow = { workspace = true } async-trait = { workspace = true } either = { workspace = true } -futures = { workspace = true } indexmap = { workspace = true } indoc = { workspace = true } lazy_static = { workspace = true } @@ -25,12 +24,10 @@ num-traits = "0.2.15" once_cell = { workspace = true } parking_lot = { workspace = true } petgraph = { workspace = true } -pin-project-lite = { workspace = true } regex = { workspace = true } rustc-hash = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -serde_qs = { workspace = true } sourcemap = { workspace = true } tokio = { workspace = true } tracing = { workspace = true } diff --git a/crates/turbopack-image/Cargo.toml b/crates/turbopack-image/Cargo.toml index 66bfc40f366cf..98e775f7225c8 100644 --- a/crates/turbopack-image/Cargo.toml +++ b/crates/turbopack-image/Cargo.toml @@ -29,7 +29,6 @@ image = { workspace = true, default-features = false, features = [ "bmp", "tga", ] } -indexmap = { workspace = true } mime = { workspace = true } once_cell = { workspace = true } regex = { workspace = true } diff --git a/crates/turbopack-node/Cargo.toml b/crates/turbopack-node/Cargo.toml index 6e1783d006398..31ddec72d9762 100644 --- a/crates/turbopack-node/Cargo.toml +++ b/crates/turbopack-node/Cargo.toml @@ -20,7 +20,6 @@ workspace = true anyhow = { workspace = true } async-stream = "0.3.4" async-trait = { workspace = true } -bytes = { workspace = true } const_format = "0.2.30" futures = { workspace = true } futures-retry = { workspace = true } diff --git a/crates/turbopack-nodejs/Cargo.toml b/crates/turbopack-nodejs/Cargo.toml index 673d8e8cf4eac..d49dec0df3605 100644 --- a/crates/turbopack-nodejs/Cargo.toml +++ b/crates/turbopack-nodejs/Cargo.toml @@ -23,9 +23,6 @@ anyhow = { workspace = true } indexmap = { workspace = true } indoc = { workspace = true } serde = { workspace = true } -serde_json = { workspace = true } -serde_qs = { workspace = true } -sourcemap = { workspace = true } tracing = { workspace = true } urlencoding = { workspace = true } @@ -33,7 +30,6 @@ turbo-tasks = { workspace = true } turbo-tasks-fs = { workspace = true } turbo-tasks-hash = { workspace = true } turbopack-core = { workspace = true } -turbopack-css = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-ecmascript-runtime = { workspace = true } diff --git a/crates/turbopack-trace-server/Cargo.toml b/crates/turbopack-trace-server/Cargo.toml index c1e2485de599d..150c0d277bf38 100644 --- a/crates/turbopack-trace-server/Cargo.toml +++ b/crates/turbopack-trace-server/Cargo.toml @@ -13,13 +13,9 @@ bench = false [dependencies] anyhow = { workspace = true, features = ["backtrace"] } -clap = { workspace = true, features = ["derive", "env"] } either = { workspace = true } -futures = { workspace = true } indexmap = { workspace = true, features = ["serde"] } -intervaltree = "0.2.7" itertools = { workspace = true } -owo-colors = { workspace = true } postcard = { workspace = true } rustc-demangle = "0.1" serde = { workspace = true } diff --git a/crates/turbopack-wasm/Cargo.toml b/crates/turbopack-wasm/Cargo.toml index dc30eafd076a2..5628920ad32cb 100644 --- a/crates/turbopack-wasm/Cargo.toml +++ b/crates/turbopack-wasm/Cargo.toml @@ -19,7 +19,6 @@ indoc = { workspace = true } serde = { workspace = true } turbo-tasks = { workspace = true } turbo-tasks-fs = { workspace = true } -turbo-tasks-hash = { workspace = true } turbopack-core = { workspace = true } turbopack-ecmascript = { workspace = true } wasmparser = "0.110.0" diff --git a/crates/turbopack/Cargo.toml b/crates/turbopack/Cargo.toml index 619786302b242..28f080d694316 100644 --- a/crates/turbopack/Cargo.toml +++ b/crates/turbopack/Cargo.toml @@ -34,9 +34,7 @@ turbo-tasks-fs = { workspace = true } turbopack-core = { workspace = true } turbopack-css = { workspace = true } turbopack-ecmascript = { workspace = true } -turbopack-ecmascript-plugins = { workspace = true } turbopack-env = { workspace = true } -turbopack-image = { workspace = true } turbopack-json = { workspace = true } turbopack-mdx = { workspace = true } turbopack-node = { workspace = true } diff --git a/crates/turborepo-auth/Cargo.toml b/crates/turborepo-auth/Cargo.toml index 139d73d97d43d..769d4ff9e556b 100644 --- a/crates/turborepo-auth/Cargo.toml +++ b/crates/turborepo-auth/Cargo.toml @@ -18,7 +18,6 @@ lazy_static.workspace = true reqwest.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } -tempfile.workspace = true thiserror = "1.0.38" tokio.workspace = true tracing.workspace = true diff --git a/crates/turborepo-cache/Cargo.toml b/crates/turborepo-cache/Cargo.toml index 8f59991e60ad1..39db432bcf79d 100644 --- a/crates/turborepo-cache/Cargo.toml +++ b/crates/turborepo-cache/Cargo.toml @@ -24,14 +24,9 @@ workspace = true [dependencies] base64 = "0.21.0" -bytes.workspace = true camino = { workspace = true } -chrono = { workspace = true } -dunce = { workspace = true } futures = { workspace = true } -hex = { workspace = true } hmac = "0.12.1" -lazy_static = { workspace = true } os_str_bytes = "6.5.0" path-clean = { workspace = true } petgraph = "0.6.3" @@ -46,5 +41,4 @@ tracing = { workspace = true } turbopath = { workspace = true } turborepo-analytics = { workspace = true } turborepo-api-client = { workspace = true } -turborepo-ui = { workspace = true } zstd = "0.12.3" diff --git a/crates/turborepo-env/Cargo.toml b/crates/turborepo-env/Cargo.toml index c3260512a37cf..eff52b2121c88 100644 --- a/crates/turborepo-env/Cargo.toml +++ b/crates/turborepo-env/Cargo.toml @@ -11,7 +11,6 @@ workspace = true [dependencies] hex = { workspace = true } -lazy_static = { workspace = true } regex = { workspace = true } serde = { workspace = true } sha2 = { workspace = true } diff --git a/crates/turborepo-filewatch/Cargo.toml b/crates/turborepo-filewatch/Cargo.toml index 0b9d12b4928c7..bd21f7fab19ec 100644 --- a/crates/turborepo-filewatch/Cargo.toml +++ b/crates/turborepo-filewatch/Cargo.toml @@ -10,8 +10,6 @@ license = "MPL-2.0" workspace = true [dependencies] -anyhow = { workspace = true } -dashmap = { workspace = true } futures = { version = "0.3.26" } itertools = { workspace = true } notify = { workspace = true } diff --git a/crates/turborepo-globwatch/Cargo.toml b/crates/turborepo-globwatch/Cargo.toml index 4955adc22ed34..1bfba17e0cd25 100644 --- a/crates/turborepo-globwatch/Cargo.toml +++ b/crates/turborepo-globwatch/Cargo.toml @@ -9,13 +9,10 @@ license = "MIT OR Apache-2.0" workspace = true [dependencies] -camino = "1.1.4" futures = { version = "0.3.26" } itertools.workspace = true merge-streams = "0.1.2" notify = { workspace = true } -notify-debouncer-mini = { workspace = true } -pin-project = "1.0.12" stop-token = "0.7.0" thiserror = { workspace = true } tokio = { version = "1.25.0", features = ["sync"] } @@ -23,7 +20,6 @@ tokio-stream = "0.1.12" tracing = "0.1.37" turbopath = { workspace = true } unic-segment = "0.9.0" -walkdir = "2.3.2" [dev-dependencies] test-case = "3.0.0" diff --git a/crates/turborepo-lib/Cargo.toml b/crates/turborepo-lib/Cargo.toml index 5a1e55da1bda3..475dc0e44eb3a 100644 --- a/crates/turborepo-lib/Cargo.toml +++ b/crates/turborepo-lib/Cargo.toml @@ -11,9 +11,6 @@ default = ["rustls-tls", "daemon-package-discovery"] native-tls = ["turborepo-api-client/native-tls", "turbo-updater/native-tls"] rustls-tls = ["turborepo-api-client/rustls-tls", "turbo-updater/rustls-tls"] -# serve the daemon over a port (useful for testing) -http = ["tonic-reflection"] - go-daemon = [] daemon-package-discovery = [] @@ -37,48 +34,67 @@ workspace = true [dependencies] atty = { workspace = true } -axum = { workspace = true } -axum-server = { workspace = true } +biome_deserialize = { workspace = true } +biome_diagnostics = { workspace = true } +biome_json_parser = { workspace = true } +biome_json_syntax = { workspace = true } +camino = "1.1.4" +capnp = "0.17.2" chrono = { workspace = true, features = ["serde"] } clap = { workspace = true, features = ["derive", "env"] } clap_complete = { workspace = true } command-group = { version = "2.1.0", features = ["with-tokio"] } console = { workspace = true } +const_format = "0.2.30" +convert_case = "0.6.0" crossterm = "0.26" ctrlc = { version = "3.4.0", features = ["termination"] } dialoguer = { workspace = true, features = ["fuzzy-select"] } directories = "4.0.1" dirs-next = "2.0.0" dunce = { workspace = true } -futures = "0.3.26" +either = { workspace = true } +futures = "0.3.30" +futures-core = "0.3.30" +globwalk = { version = "0.1.0", path = "../turborepo-globwalk" } globwatch = { path = "../turborepo-globwatch" } +go-parse-duration = "0.1.1" hex = "0.4.3" -hostname = "0.3.1" humantime = "2.1.0" ignore = "0.4.22" indicatif = { workspace = true } itertools = { workspace = true } -json_comments = "0.2.1" jsonc-parser = { version = "0.21.0" } lazy_static = { workspace = true } libc = "0.2.140" +miette = { workspace = true, features = ["fancy"] } nix = "0.26.2" notify = { workspace = true } +num_cpus = "1.15.0" +owo-colors = { workspace = true } path-clean = "1.0.1" petgraph = { workspace = true } pidlock = { path = "../turborepo-pidlock" } portable-pty = "0.8.1" +pprof = { version = "0.12.1", features = [ + "prost-codec", + "frame-pointer", +], optional = true } prost = "0.12.3" rand = { workspace = true } +rayon = "1.7.0" +regex.workspace = true reqwest = { workspace = true, default-features = false, features = ["json"] } -rustc_version_runtime = "0.2.1" semver = { workspace = true } serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } serde_yaml = { workspace = true } sha2 = { workspace = true } shared_child = "1.0.0" +struct_iterable = "0.1.1" +svix-ksuid = { version = "0.7.0", features = ["serde"] } sysinfo = "0.27.7" +tabwriter = "1.3.0" thiserror = "1.0.38" time = "0.3.20" tiny-gradient = { workspace = true } @@ -86,65 +102,32 @@ tokio = { workspace = true, features = ["full", "time"] } tokio-stream = { version = "0.1.12", features = ["net"] } tokio-util = { version = "0.7.7", features = ["compat"] } tonic = { version = "0.11.0", features = ["transport"] } -tonic-reflection = { version = "0.11.0", optional = true } tower = "0.4.13" -turborepo-analytics = { path = "../turborepo-analytics" } -turborepo-auth = { path = "../turborepo-auth" } -turborepo-dirs = { path = "../turborepo-dirs" } - -turborepo-fs = { path = "../turborepo-fs" } -turborepo-graph-utils = { path = "../turborepo-graph-utils" } -turborepo-repository = { path = "../turborepo-repository" } -turborepo-vercel-api = { path = "../turborepo-vercel-api" } -uds_windows = "1.0.2" -url = "2.3.1" - -biome_console = { workspace = true } -biome_deserialize = { workspace = true } -biome_diagnostics = { workspace = true } -biome_json_parser = { workspace = true } -biome_json_syntax = { workspace = true } - -camino = "1.1.4" -capnp = "0.17.2" -const_format = "0.2.30" -convert_case = "0.6.0" -either.workspace = true -futures-core = "0.3.30" -globwalk = { version = "0.1.0", path = "../turborepo-globwalk" } -go-parse-duration = "0.1.1" -is-terminal = "0.4.7" -lazy-regex = "2.5.0" -miette = { workspace = true, features = ["fancy"] } -node-semver = "2.1.0" -num_cpus = "1.15.0" -owo-colors.workspace = true -pprof = { version = "0.12.1", features = [ - "prost-codec", - "frame-pointer", -], optional = true } -rayon = "1.7.0" -regex.workspace = true -struct_iterable = "0.1.1" -svix-ksuid = { version = "0.7.0", features = ["serde"] } -tabwriter = "1.3.0" tracing-appender = "0.2.2" tracing-chrome = "0.7.1" tracing-subscriber = { version = "0.3.17", features = ["env-filter"] } tracing.workspace = true turbo-updater = { workspace = true } turbopath = { workspace = true } +turborepo-analytics = { path = "../turborepo-analytics" } turborepo-api-client = { workspace = true } +turborepo-auth = { path = "../turborepo-auth" } turborepo-cache = { workspace = true } turborepo-ci = { workspace = true } +turborepo-dirs = { path = "../turborepo-dirs" } turborepo-env = { workspace = true } turborepo-errors = { workspace = true } turborepo-filewatch = { path = "../turborepo-filewatch" } +turborepo-fs = { path = "../turborepo-fs" } +turborepo-graph-utils = { path = "../turborepo-graph-utils" } turborepo-lockfiles = { workspace = true } +turborepo-repository = { path = "../turborepo-repository" } turborepo-scm = { workspace = true } turborepo-telemetry = { path = "../turborepo-telemetry" } turborepo-ui = { workspace = true } +turborepo-vercel-api = { path = "../turborepo-vercel-api" } twox-hash = "1.6.3" +uds_windows = "1.0.2" wax = { workspace = true } webbrowser = { workspace = true } which = { workspace = true } diff --git a/crates/turborepo-lsp/Cargo.toml b/crates/turborepo-lsp/Cargo.toml index 4d5e45bf32d1a..9d37dd517fcfe 100644 --- a/crates/turborepo-lsp/Cargo.toml +++ b/crates/turborepo-lsp/Cargo.toml @@ -13,19 +13,13 @@ rustls-tls = ["turborepo-lib/rustls-tls"] [dependencies] crop = "0.4.0" -futures.workspace = true itertools.workspace = true jsonc-parser = "0.23.0" pidlock = { version = "0.1.4", path = "../turborepo-pidlock" } serde_json.workspace = true tokio = { workspace = true, features = ["rt-multi-thread", "macros", "io-std"] } tokio-retry = "0.3.0" -tokio-util = { version = "0.7.10", features = ["codec"] } -tower = "0.4.13" tower-lsp = "0.20.0" -tower-uds = { version = "0.1.0", path = "../tower-uds" } -tracing-subscriber = "0.3.18" -tracing.workspace = true turbopath = { version = "0.1.0", path = "../turborepo-paths" } turborepo-lib = { version = "0.1.0", path = "../turborepo-lib" } turborepo-repository = { version = "0.1.0", path = "../turborepo-repository" } diff --git a/crates/turborepo-telemetry/Cargo.toml b/crates/turborepo-telemetry/Cargo.toml index 4f78673793d38..ac256775e9184 100644 --- a/crates/turborepo-telemetry/Cargo.toml +++ b/crates/turborepo-telemetry/Cargo.toml @@ -19,12 +19,10 @@ turborepo-vercel-api-mock = { workspace = true } async-trait = { workspace = true } chrono = { workspace = true, features = ["serde"] } config = { version = "0.13.4", default-features = false, features = ["json"] } -dirs-next = "2.0.0" futures = { workspace = true } hex = "0.4.3" once_cell = "1.18.0" reqwest = { workspace = true, features = ["json"] } -rustc_version_runtime = "0.3.0" serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } sha2 = "0.10.8" diff --git a/crates/turborepo-ui/Cargo.toml b/crates/turborepo-ui/Cargo.toml index 26d1d3f8a36b0..f0d1881aeeb58 100644 --- a/crates/turborepo-ui/Cargo.toml +++ b/crates/turborepo-ui/Cargo.toml @@ -7,7 +7,7 @@ license = "MPL-2.0" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dev-dependencies] anyhow = { workspace = true } -indoc.workspace = true +indoc = { workspace = true } tempfile = { workspace = true } test-case = { workspace = true } @@ -18,7 +18,7 @@ workspace = true atty = { workspace = true } console = { workspace = true } crossterm = "0.26.1" -dialoguer.workspace = true +dialoguer = { workspace = true } indicatif = { workspace = true } lazy_static = { workspace = true } nix = { version = "0.26.2", features = ["signal"] } @@ -27,6 +27,5 @@ thiserror = { workspace = true } tracing = { workspace = true } tui-term = { workspace = true } turbopath = { workspace = true } -turborepo-ci = { workspace = true } turborepo-vt100 = { workspace = true } winapi = "0.3.9" diff --git a/crates/turborepo-vercel-api-mock/Cargo.toml b/crates/turborepo-vercel-api-mock/Cargo.toml index c4a4dab01e5f9..920ad4be42ff3 100644 --- a/crates/turborepo-vercel-api-mock/Cargo.toml +++ b/crates/turborepo-vercel-api-mock/Cargo.toml @@ -12,7 +12,6 @@ workspace = true [dependencies] anyhow = { workspace = true } axum = { workspace = true } -axum-macros = "0.3.7" axum-server = "0.4.7" futures-util = "0.3.28" port_scanner = { workspace = true } diff --git a/crates/turborepo/Cargo.toml b/crates/turborepo/Cargo.toml index b2f3dad1677a6..4cbf580a3483c 100644 --- a/crates/turborepo/Cargo.toml +++ b/crates/turborepo/Cargo.toml @@ -12,7 +12,6 @@ license = "MPL-2.0" default = ["rustls-tls", "turborepo-lib/daemon-package-discovery"] native-tls = ["turborepo-lib/native-tls"] rustls-tls = ["turborepo-lib/rustls-tls"] -http = ["turborepo-lib/http"] go-daemon = ["turborepo-lib/go-daemon"] pprof = ["turborepo-lib/pprof"] @@ -30,18 +29,8 @@ workspace = true [dependencies] anyhow = { workspace = true, features = ["backtrace"] } -clap = { workspace = true, features = ["derive"] } -clap_complete = { workspace = true } -command-group = { version = "2.0.1", features = ["with-tokio"] } -dunce = { workspace = true } human-panic = "1.2.1" miette.workspace = true -serde = { workspace = true, features = ["derive"] } -serde_json = { workspace = true } -serde_yaml = { workspace = true } -tiny-gradient = { workspace = true } -tokio-util = { version = "0.7.7", features = ["io"] } -tracing = { workspace = true } turborepo-lib = { workspace = true, default-features = false } [target.'cfg(target_os = "windows")'.dependencies] From ca36d9b413891af9b295d2b68d4293ad74259ef0 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Sat, 17 Feb 2024 04:32:01 +0100 Subject: [PATCH 02/11] update toolchain --- .github/actions/setup-rust/action.yml | 26 ++++------------- .github/actions/setup-rust/matchers.json | 28 ------------------- .github/workflows/test.yml | 3 -- Cargo.toml | 4 +++ crates/turbo-tasks-fs/src/lib.rs | 2 ++ .../tests/value_debug.rs | 1 + .../turbo-tasks-memory/src/task/meta_state.rs | 1 + crates/turbo-tasks-signposter/src/log.rs | 2 ++ .../src/task/concrete_task_input.rs | 6 ++-- crates/turbopack-core/src/resolve/pattern.rs | 4 +-- .../src/tree_shake/graph.rs | 6 ++-- crates/turbopack-image/src/process/mod.rs | 5 +--- rust-toolchain | 1 - rust-toolchain.toml | 4 +++ 14 files changed, 27 insertions(+), 66 deletions(-) delete mode 100644 rust-toolchain create mode 100644 rust-toolchain.toml diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index bd94dae3798eb..9ffbb3c417b56 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -8,9 +8,6 @@ inputs: targets: description: "Comma-separated list of target triples to install for this toolchain" required: false - components: - description: "Comma-separated list of components to be additionally installed" - required: false github-token: description: "GitHub token. You can pass secrets.GITHUB_TOKEN" required: true @@ -28,27 +25,14 @@ inputs: runs: using: "composite" steps: - - name: "Get toolchain version from file" - id: file - shell: bash - run: echo "toolchain=$(cat ./rust-toolchain)" >> $GITHUB_OUTPUT - - - name: "Set rust default environment" - shell: bash - run: | - echo "CARGO_INCREMENTAL=0" >> $GITHUB_ENV - echo "CARGO_TERM_COLOR=always" >> $GITHUB_ENV - echo "RUST_BACKTRACE=short" >> $GITHUB_ENV - # Enable faster sparse index on nightly - # https://internals.rust-lang.org/t/call-for-testing-cargo-sparse-registry/16862 - echo "CARGO_UNSTABLE_SPARSE_REGISTRY=true" >> $GITHUB_ENV - - name: "Setup Rust toolchain" - uses: dtolnay/rust-toolchain@master + uses: actions-rust-lang/setup-rust-toolchain@v1 with: - toolchain: ${{ steps.file.outputs.toolchain }} targets: ${{ inputs.targets }} - components: ${{ inputs.components }} + # needed to not make it override the defaults + rustflags: "" + # we want more specific settings + cache: false - name: "Set Windows default host to MinGW" if: ${{ inputs.windows == 'true' }} diff --git a/.github/actions/setup-rust/matchers.json b/.github/actions/setup-rust/matchers.json index aff246556a3db..ba9a4730e7d0c 100644 --- a/.github/actions/setup-rust/matchers.json +++ b/.github/actions/setup-rust/matchers.json @@ -1,22 +1,5 @@ { "problemMatcher": [ - { - "owner": "cargo-common", - "pattern": [ - { - "regexp": "^(warning|warn|error)(?:\\[(\\S*)\\])?: (.*)$", - "severity": 1, - "code": 2, - "message": 3 - }, - { - "regexp": "^(?:[\\s->=]*(.*):(\\d*):(\\d*)|.*)$", - "file": 1, - "line": 2, - "column": 3 - } - ] - }, { "owner": "cargo-test", "pattern": [ @@ -28,17 +11,6 @@ "column": 4 } ] - }, - { - "owner": "rustfmt", - "pattern": [ - { - "regexp": "^(Diff in (\\S+)) at line (\\d+):", - "message": 1, - "file": 2, - "line": 3 - } - ] } ] } diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 30e5d21ab90b0..3c6f79d30a82a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -425,7 +425,6 @@ jobs: - name: Setup Rust uses: ./.github/actions/setup-rust with: - components: rustfmt github-token: "${{ secrets.GITHUB_TOKEN }}" - name: Run cargo fmt check @@ -513,7 +512,6 @@ jobs: - name: Setup Rust uses: ./.github/actions/setup-rust with: - components: clippy targets: wasm32-unknown-unknown,wasm32-wasip1-threads - name: Run cargo check release @@ -539,7 +537,6 @@ jobs: - name: Setup Rust uses: ./.github/actions/setup-rust with: - components: clippy targets: wasm32-unknown-unknown github-token: "${{ secrets.GITHUB_TOKEN }}" diff --git a/Cargo.toml b/Cargo.toml index 0bcc41008b0a1..d4a9d9a33d92b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,6 +96,10 @@ opt-level = "z" inherits = "release" strip = true +[patch.crates-io] +# temporary patch until https://github.com/servo/pathfinder/pull/548 gets released. +pathfinder_simd = { git = "https://github.com/servo/pathfinder.git", rev = "e4fcda0d5259d0acf902aee6de7d2501f2bd6629" } + # Declare dependencies used across workspace packages requires single version bump. # ref: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#inheriting-a-dependency-from-a-workspace [workspace.dependencies] diff --git a/crates/turbo-tasks-fs/src/lib.rs b/crates/turbo-tasks-fs/src/lib.rs index 95d73031000a4..e828fbe69ce90 100644 --- a/crates/turbo-tasks-fs/src/lib.rs +++ b/crates/turbo-tasks-fs/src/lib.rs @@ -5,6 +5,7 @@ #![feature(io_error_more)] #![feature(round_char_boundary)] #![feature(arbitrary_self_types)] +#![feature(lint_reasons)] pub mod attach; pub mod embed; @@ -249,6 +250,7 @@ impl DiskFileSystem { } } +#[allow(dead_code, reason = "we need to hold onto the locks")] struct PathLockGuard<'a>( #[allow(dead_code)] RwLockReadGuard<'a, ()>, #[allow(dead_code)] mutex_map::MutexMapGuard<'a, PathBuf>, diff --git a/crates/turbo-tasks-macros-tests/tests/value_debug.rs b/crates/turbo-tasks-macros-tests/tests/value_debug.rs index 37380e6bf3cf7..0bbb7c2a0d165 100644 --- a/crates/turbo-tasks-macros-tests/tests/value_debug.rs +++ b/crates/turbo-tasks-macros-tests/tests/value_debug.rs @@ -5,6 +5,7 @@ register!(); #[tokio::test] async fn ignored_indexes() { + #[allow(dead_code)] #[derive(ValueDebugFormat)] struct IgnoredIndexes( #[allow(dead_code)] diff --git a/crates/turbo-tasks-memory/src/task/meta_state.rs b/crates/turbo-tasks-memory/src/task/meta_state.rs index 0adc85679e0e7..381a81e90a274 100644 --- a/crates/turbo-tasks-memory/src/task/meta_state.rs +++ b/crates/turbo-tasks-memory/src/task/meta_state.rs @@ -88,6 +88,7 @@ pub(super) type TaskMetaStateAsPartialMut = pub(super) type TaskMetaStateAsUnloadedMut = for<'a> fn(&'a mut TaskMetaState) -> Option<&'a mut UnloadedTaskState>; +#[allow(dead_code, reason = "test")] pub(super) enum TaskMetaStateReadGuard<'a> { Full(ReadGuard<'a, TaskMetaState, TaskState, TaskMetaStateAsFull>), Partial(ReadGuard<'a, TaskMetaState, PartialTaskState, TaskMetaStateAsPartial>), diff --git a/crates/turbo-tasks-signposter/src/log.rs b/crates/turbo-tasks-signposter/src/log.rs index d329fb1d4e006..b9138b3ad3327 100644 --- a/crates/turbo-tasks-signposter/src/log.rs +++ b/crates/turbo-tasks-signposter/src/log.rs @@ -42,6 +42,7 @@ pub struct Log { // Safety: unclear unsafe impl Sync for Log {} + // Safety: unclear unsafe impl Send for Log {} @@ -82,6 +83,7 @@ pub struct Signpost { // Safety: unclear unsafe impl Sync for Signpost {} + // Safety: unclear unsafe impl Send for Signpost {} diff --git a/crates/turbo-tasks/src/task/concrete_task_input.rs b/crates/turbo-tasks/src/task/concrete_task_input.rs index 7b6b7584e3c65..c591d652bc658 100644 --- a/crates/turbo-tasks/src/task/concrete_task_input.rs +++ b/crates/turbo-tasks/src/task/concrete_task_input.rs @@ -41,9 +41,9 @@ impl PartialEq for SharedReference { // only compares their addresses. #[allow(ambiguous_wide_pointer_comparisons)] fn eq(&self, other: &Self) -> bool { - PartialEq::eq( - &(&*self.1 as *const (dyn Any + Send + Sync)), - &(&*other.1 as *const (dyn Any + Send + Sync)), + std::ptr::addr_eq( + &*self.1 as *const (dyn Any + Send + Sync), + &*other.1 as *const (dyn Any + Send + Sync), ) } } diff --git a/crates/turbopack-core/src/resolve/pattern.rs b/crates/turbopack-core/src/resolve/pattern.rs index 9a0a8f7bdb837..2cb128cb9b571 100644 --- a/crates/turbopack-core/src/resolve/pattern.rs +++ b/crates/turbopack-core/src/resolve/pattern.rs @@ -458,7 +458,7 @@ impl Pattern { static ref FORBIDDEN: Regex = Regex::new(r"(/|^)(ROOT|\.|/|(node_modules|__tests?__)(/|$))").unwrap(); static ref FORBIDDEN_MATCH: Regex = Regex::new(r"\.d\.ts$|\.map$").unwrap(); - }; + } if let Some(m) = FORBIDDEN.find(value) { MatchResult::Consumed { remaining: value, @@ -569,7 +569,7 @@ impl Pattern { static ref FORBIDDEN: Regex = Regex::new(r"(/|^)(\.|(node_modules|__tests?__)(/|$))").unwrap(); static ref FORBIDDEN_MATCH: Regex = Regex::new(r"\.d\.ts$|\.map$").unwrap(); - }; + } if let Some(m) = FORBIDDEN.find(value) { NextConstantUntilResult::Consumed(value, Some(m.start())) } else if FORBIDDEN_MATCH.find(value).is_some() { diff --git a/crates/turbopack-ecmascript/src/tree_shake/graph.rs b/crates/turbopack-ecmascript/src/tree_shake/graph.rs index 24ebbf39c07d1..12b8b5998b9b0 100644 --- a/crates/turbopack-ecmascript/src/tree_shake/graph.rs +++ b/crates/turbopack-ecmascript/src/tree_shake/graph.rs @@ -545,10 +545,8 @@ impl DepGraph { _ => {} }, ModuleDecl::ExportNamed(NamedExport { - src: None, - specifiers, - .. - }) => { + src, specifiers, .. + }) if src.is_none() => { // We are not interested in re-exports. for s in specifiers { match s { diff --git a/crates/turbopack-image/src/process/mod.rs b/crates/turbopack-image/src/process/mod.rs index f5261dc681c2a..20548d7fee016 100644 --- a/crates/turbopack-image/src/process/mod.rs +++ b/crates/turbopack-image/src/process/mod.rs @@ -52,6 +52,7 @@ impl BlurPlaceholder { #[serde_as] #[turbo_tasks::value] #[derive(Default)] +#[non_exhaustive] pub struct ImageMetaData { pub width: u32, pub height: u32, @@ -59,7 +60,6 @@ pub struct ImageMetaData { #[serde_as(as = "Option")] pub mime_type: Option, pub blur_placeholder: Option, - placeholder_for_future_extensions: (), } impl ImageMetaData { @@ -69,7 +69,6 @@ impl ImageMetaData { height: 100, mime_type, blur_placeholder: Some(BlurPlaceholder::fallback()), - placeholder_for_future_extensions: (), } } } @@ -369,7 +368,6 @@ pub async fn get_meta_data( height, mime_type: Some(mime::IMAGE_SVG), blur_placeholder: None, - placeholder_for_future_extensions: (), } .cell()); } @@ -407,7 +405,6 @@ pub async fn get_meta_data( None }, blur_placeholder, - placeholder_for_future_extensions: (), } .cell()) } diff --git a/rust-toolchain b/rust-toolchain deleted file mode 100644 index fb98c0f091c33..0000000000000 --- a/rust-toolchain +++ /dev/null @@ -1 +0,0 @@ -nightly-2024-04-03 diff --git a/rust-toolchain.toml b/rust-toolchain.toml new file mode 100644 index 0000000000000..59c3a03ab6aaf --- /dev/null +++ b/rust-toolchain.toml @@ -0,0 +1,4 @@ +[toolchain] +channel = "nightly-2024-04-03" +components = ["rustfmt", "clippy"] +profile = "minimal" From 6e3f2aa73d7f320a6677ed76428431c878682a83 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Sat, 17 Feb 2024 06:22:46 +0100 Subject: [PATCH 03/11] fix action --- .github/actions/setup-rust/action.yml | 2 +- Cargo.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/actions/setup-rust/action.yml b/.github/actions/setup-rust/action.yml index 9ffbb3c417b56..7c6039ae6b3eb 100644 --- a/.github/actions/setup-rust/action.yml +++ b/.github/actions/setup-rust/action.yml @@ -28,7 +28,7 @@ runs: - name: "Setup Rust toolchain" uses: actions-rust-lang/setup-rust-toolchain@v1 with: - targets: ${{ inputs.targets }} + target: ${{ inputs.targets }} # needed to not make it override the defaults rustflags: "" # we want more specific settings diff --git a/Cargo.lock b/Cargo.lock index c07b89b459a89..9065d3a892d10 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1847,9 +1847,9 @@ dependencies = [ [[package]] name = "corosensei" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9847f90f32a50b0dcbd68bc23ff242798b13080b97b0569f6ed96a45ce4cf2cd" +checksum = "80128832c58ea9cbd041d2a759ec449224487b2c1e400453d99d244eead87a8e" dependencies = [ "autocfg 1.1.0", "cfg-if 1.0.0", From 05250566b05debd7e4a7a397576e3302cd038992 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 19 Feb 2024 15:27:37 +0100 Subject: [PATCH 04/11] missing dep --- Cargo.lock | 159 +------------------------------ crates/turbopack-css/Cargo.toml | 1 + crates/turborepo-auth/Cargo.toml | 1 + 3 files changed, 6 insertions(+), 155 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9065d3a892d10..814bf222fcbbf 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -610,18 +610,6 @@ dependencies = [ "tower-service", ] -[[package]] -name = "axum-macros" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2bb524613be645939e280b7279f7b017f98cf7f5ef084ec374df373530e73277" -dependencies = [ - "heck 0.4.1", - "proc-macro2", - "quote", - "syn 2.0.32", -] - [[package]] name = "axum-server" version = "0.4.7" @@ -1648,7 +1636,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e57ff02e8ad8e06ab9731d5dc72dc23bef9200778eae1a89d555d8c42e5d4a86" dependencies = [ "prost 0.11.8", - "prost-types 0.11.8", + "prost-types", "tonic 0.8.3", "tracing-core", ] @@ -1665,7 +1653,7 @@ dependencies = [ "futures 0.3.28", "hdrhistogram", "humantime", - "prost-types 0.11.8", + "prost-types", "serde", "serde_json", "thread_local", @@ -3299,13 +3287,10 @@ dependencies = [ name = "globwatch" version = "0.1.0" dependencies = [ - "camino", "futures 0.3.28", "itertools 0.10.5", "merge-streams", "notify", - "notify-debouncer-mini", - "pin-project", "stop-token", "test-case", "thiserror", @@ -3316,7 +3301,6 @@ dependencies = [ "tracing-test", "turbopath", "unic-segment", - "walkdir", ] [[package]] @@ -4133,12 +4117,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "json_comments" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41ee439ee368ba4a77ac70d04f14015415af8600d6c894dc1f11bd79758c57d5" - [[package]] name = "jsonc-parser" version = "0.21.0" @@ -5187,15 +5165,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "notify-debouncer-mini" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e55ee272914f4563a2f8b8553eb6811f3c0caea81c756346bad15b7e3ef969f0" -dependencies = [ - "notify", -] - [[package]] name = "ntapi" version = "0.4.1" @@ -6182,7 +6151,7 @@ dependencies = [ "petgraph", "prettyplease 0.1.25", "prost 0.11.8", - "prost-types 0.11.8", + "prost-types", "regex", "syn 1.0.109", "tempfile", @@ -6224,15 +6193,6 @@ dependencies = [ "prost 0.11.8", ] -[[package]] -name = "prost-types" -version = "0.12.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "193898f59edcf43c26227dcd4c8427f00d99d61e95dcde58dabd49fa291d470e" -dependencies = [ - "prost 0.12.3", -] - [[package]] name = "psm" version = "0.1.21" @@ -6273,15 +6233,6 @@ dependencies = [ "unicase 2.6.0", ] -[[package]] -name = "qstring" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d464fae65fff2680baf48019211ce37aaec0c78e9264c84a3e484717f965104e" -dependencies = [ - "percent-encoding 2.3.0", -] - [[package]] name = "quick-error" version = "2.0.1" @@ -6980,16 +6931,6 @@ dependencies = [ "semver 0.9.0", ] -[[package]] -name = "rustc_version_runtime" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dd18cd2bae1820af0b6ad5e54f4a51d0f3fcc53b05f845675074efcc7af071d" -dependencies = [ - "rustc_version 0.4.0", - "semver 1.0.18", -] - [[package]] name = "rustix" version = "0.37.23" @@ -10248,19 +10189,6 @@ dependencies = [ "syn 1.0.109", ] -[[package]] -name = "tonic-reflection" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "548c227bd5c0fae5925812c4ec6c66ffcfced23ea370cb823f4d18f0fc1cb6a7" -dependencies = [ - "prost 0.12.3", - "prost-types 0.12.3", - "tokio", - "tokio-stream", - "tonic 0.11.0", -] - [[package]] name = "tower" version = "0.4.13" @@ -10332,7 +10260,6 @@ name = "tower-uds" version = "0.1.0" dependencies = [ "async-io", - "http", "tokio", "tokio-util", "tower", @@ -10533,20 +10460,10 @@ dependencies = [ "anyhow", "assert_cmd", "build-target", - "clap 4.5.2", - "clap_complete", - "command-group", - "dunce", "human-panic", "itertools 0.10.5", "miette 5.10.0", "pretty_assertions", - "serde", - "serde_json", - "serde_yaml 0.9.27", - "tiny-gradient", - "tokio-util", - "tracing", "turborepo-lib", "winapi 0.3.9", ] @@ -10574,7 +10491,6 @@ dependencies = [ "serde_json", "serde_regex", "serde_test", - "stable_deref_trait", "thiserror", "tokio", "tracing", @@ -10604,7 +10520,6 @@ dependencies = [ "serde", "serde_bytes", "serde_test", - "tokio", "turbo-tasks", "turbo-tasks-build", ] @@ -10628,7 +10543,6 @@ version = "0.1.0" dependencies = [ "anyhow", "httpmock", - "indexmap 1.9.3", "lazy_static", "reqwest", "serde", @@ -10694,7 +10608,6 @@ name = "turbo-tasks-macros" version = "0.1.0" dependencies = [ "anyhow", - "convert_case 0.6.0", "proc-macro-error", "proc-macro2", "quote", @@ -10812,9 +10725,7 @@ dependencies = [ "turbopack-core", "turbopack-css", "turbopack-ecmascript", - "turbopack-ecmascript-plugins", "turbopack-env", - "turbopack-image", "turbopack-json", "turbopack-mdx", "turbopack-node", @@ -10829,12 +10740,8 @@ version = "0.1.0" dependencies = [ "anyhow", "chromiumoxide", - "clap 4.5.2", - "console-subscriber", "criterion", - "dunce", "futures 0.3.28", - "mime 0.3.17", "nix 0.26.2", "once_cell", "owo-colors", @@ -10842,7 +10749,6 @@ dependencies = [ "portpicker", "rand 0.8.5", "regex", - "serde", "serde_json", "tempfile", "tokio", @@ -10851,7 +10757,6 @@ dependencies = [ "turbo-tasks-testing", "turbopack-create-test-app", "url 2.4.1", - "webbrowser", ] [[package]] @@ -10918,7 +10823,6 @@ dependencies = [ "serde", "serde_json", "serde_qs", - "swc_core", "tracing", "turbo-tasks", "turbo-tasks-build", @@ -10926,7 +10830,6 @@ dependencies = [ "turbo-tasks-hash", "turbopack", "turbopack-core", - "turbopack-css", "turbopack-ecmascript", "turbopack-ecmascript-runtime", "turbopack-resolve", @@ -10944,13 +10847,10 @@ dependencies = [ "dunce", "futures 0.3.28", "mime 0.3.17", - "once_cell", "owo-colors", "regex", "serde", - "serde_json", "tokio", - "tracing", "tracing-signpost", "tracing-subscriber", "turbo-tasks", @@ -10983,7 +10883,6 @@ dependencies = [ "anyhow", "clap 4.5.2", "crossterm 0.26.1", - "once_cell", "owo-colors", "serde", "turbo-tasks", @@ -11008,13 +10907,11 @@ dependencies = [ "lazy_static", "once_cell", "patricia_tree", - "qstring", "ref-cast", "regex", "rstest", "serde", "serde_json", - "serde_qs", "sourcemap", "swc_core", "tokio", @@ -11045,7 +10942,6 @@ name = "turbopack-css" version = "0.1.0" dependencies = [ "anyhow", - "async-trait", "indexmap 1.9.3", "indoc", "lightningcss", @@ -11080,7 +10976,6 @@ dependencies = [ "indexmap 1.9.3", "mime 0.3.17", "mime_guess", - "once_cell", "parking_lot 0.12.1", "pin-project-lite", "serde", @@ -11111,7 +11006,6 @@ dependencies = [ "async-trait", "criterion", "either", - "futures 0.3.28", "indexmap 1.9.3", "indoc", "lazy_static", @@ -11120,13 +11014,11 @@ dependencies = [ "once_cell", "parking_lot 0.12.1", "petgraph", - "pin-project-lite", "regex", "rstest", "rustc-hash", "serde", "serde_json", - "serde_qs", "sourcemap", "swc_core", "tokio", @@ -11163,7 +11055,6 @@ dependencies = [ "indexmap 1.9.3", "lightningcss", "modularize_imports", - "parcel_selectors", "serde", "serde_json", "styled_components", @@ -11185,7 +11076,6 @@ dependencies = [ "anyhow", "indoc", "serde", - "swc_core", "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", @@ -11216,7 +11106,6 @@ dependencies = [ "anyhow", "base64 0.21.4", "image 0.25.0", - "indexmap 1.9.3", "mime 0.3.17", "once_cell", "regex", @@ -11263,7 +11152,6 @@ dependencies = [ "anyhow", "async-stream", "async-trait", - "bytes 1.5.0", "const_format", "futures 0.3.28", "futures-retry", @@ -11301,16 +11189,12 @@ dependencies = [ "indexmap 1.9.3", "indoc", "serde", - "serde_json", - "serde_qs", - "sourcemap", "tracing", "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", "turbo-tasks-hash", "turbopack-core", - "turbopack-css", "turbopack-ecmascript", "turbopack-ecmascript-runtime", "urlencoding", @@ -11415,13 +11299,9 @@ name = "turbopack-trace-server" version = "0.1.0" dependencies = [ "anyhow", - "clap 4.5.2", "either", - "futures 0.3.28", "indexmap 1.9.3", - "intervaltree", "itertools 0.10.5", - "owo-colors", "postcard", "rustc-demangle", "serde", @@ -11457,7 +11337,6 @@ dependencies = [ "turbo-tasks", "turbo-tasks-build", "turbo-tasks-fs", - "turbo-tasks-hash", "turbopack-core", "turbopack-ecmascript", "wasmparser 0.110.0", @@ -11508,7 +11387,7 @@ dependencies = [ "port_scanner", "regex", "reqwest", - "rustc_version_runtime 0.2.1", + "rustc_version_runtime", "serde", "serde_json", "test-case", @@ -11537,7 +11416,6 @@ dependencies = [ "reqwest", "serde", "serde_json", - "tempfile", "thiserror", "tokio", "tracing", @@ -11557,14 +11435,9 @@ version = "0.1.0" dependencies = [ "anyhow", "base64 0.21.4", - "bytes 1.5.0", "camino", - "chrono", - "dunce", "futures 0.3.28", - "hex", "hmac", - "lazy_static", "libc", "os_str_bytes", "path-clean 1.0.1", @@ -11583,7 +11456,6 @@ dependencies = [ "turbopath", "turborepo-analytics", "turborepo-api-client", - "turborepo-ui", "turborepo-vercel-api-mock", "zstd 0.12.3+zstd.1.5.2", ] @@ -11610,7 +11482,6 @@ name = "turborepo-env" version = "0.1.0" dependencies = [ "hex", - "lazy_static", "regex", "serde", "sha2", @@ -11633,9 +11504,7 @@ dependencies = [ name = "turborepo-filewatch" version = "0.1.0" dependencies = [ - "anyhow", "bitflags 1.3.2", - "dashmap", "fsevent-sys", "futures 0.3.28", "itertools 0.10.5", @@ -11686,9 +11555,6 @@ dependencies = [ "async-io", "async-stream", "atty", - "axum", - "axum-server", - "biome_console", "biome_deserialize", "biome_diagnostics", "biome_json_parser", @@ -11716,20 +11582,16 @@ dependencies = [ "globwatch", "go-parse-duration", "hex", - "hostname", "humantime", "ignore", "indicatif", "is-terminal", "itertools 0.10.5", - "json_comments", "jsonc-parser 0.21.0", - "lazy-regex", "lazy_static", "libc", "miette 5.10.0", "nix 0.26.2", - "node-semver", "notify", "num_cpus", "owo-colors", @@ -11745,7 +11607,6 @@ dependencies = [ "rayon", "regex", "reqwest", - "rustc_version_runtime 0.2.1", "semver 1.0.18", "serde", "serde_json", @@ -11767,7 +11628,6 @@ dependencies = [ "tokio-util", "tonic 0.11.0", "tonic-build", - "tonic-reflection", "tower", "tracing", "tracing-appender", @@ -11796,7 +11656,6 @@ dependencies = [ "turborepo-vercel-api-mock", "twox-hash", "uds_windows", - "url 2.4.1", "wax", "webbrowser", "which", @@ -11829,19 +11688,13 @@ name = "turborepo-lsp" version = "0.1.0" dependencies = [ "crop", - "futures 0.3.28", "itertools 0.10.5", "jsonc-parser 0.23.0", "pidlock", "serde_json", "tokio", "tokio-retry", - "tokio-util", - "tower", "tower-lsp", - "tower-uds", - "tracing", - "tracing-subscriber", "turbopath", "turborepo-lib", "turborepo-repository", @@ -11920,12 +11773,10 @@ dependencies = [ "async-trait", "chrono", "config", - "dirs-next", "futures 0.3.28", "hex", "once_cell", "reqwest", - "rustc_version_runtime 0.3.0", "serde", "serde_json", "sha2", @@ -11964,7 +11815,6 @@ dependencies = [ "tracing", "tui-term", "turbopath", - "turborepo-ci", "turborepo-vt100", "winapi 0.3.9", ] @@ -11987,7 +11837,6 @@ version = "0.1.0" dependencies = [ "anyhow", "axum", - "axum-macros", "axum-server", "futures-util", "port_scanner", diff --git a/crates/turbopack-css/Cargo.toml b/crates/turbopack-css/Cargo.toml index dfab81efe800c..c9d329168b392 100644 --- a/crates/turbopack-css/Cargo.toml +++ b/crates/turbopack-css/Cargo.toml @@ -18,6 +18,7 @@ indexmap = { workspace = true } indoc = { workspace = true } lightningcss = { workspace = true } once_cell = { workspace = true } +parcel_selectors = { workspace = true } regex = { workspace = true } serde = { workspace = true } urlencoding = { workspace = true } diff --git a/crates/turborepo-auth/Cargo.toml b/crates/turborepo-auth/Cargo.toml index 769d4ff9e556b..11724cdfa54d7 100644 --- a/crates/turborepo-auth/Cargo.toml +++ b/crates/turborepo-auth/Cargo.toml @@ -18,6 +18,7 @@ lazy_static.workspace = true reqwest.workspace = true serde = { workspace = true, features = ["derive"] } serde_json = { workspace = true } +tempfile = { workspace = true } thiserror = "1.0.38" tokio.workspace = true tracing.workspace = true From 220e221bee094280e9de34bf5fe6918905f79535 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:30:32 +0100 Subject: [PATCH 05/11] missing dep --- Cargo.lock | 2 ++ crates/turborepo-lib/Cargo.toml | 1 + 2 files changed, 3 insertions(+) diff --git a/Cargo.lock b/Cargo.lock index 814bf222fcbbf..8cda61e6e3483 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -11416,6 +11416,7 @@ dependencies = [ "reqwest", "serde", "serde_json", + "tempfile", "thiserror", "tokio", "tracing", @@ -11555,6 +11556,7 @@ dependencies = [ "async-io", "async-stream", "atty", + "axum", "biome_deserialize", "biome_diagnostics", "biome_json_parser", diff --git a/crates/turborepo-lib/Cargo.toml b/crates/turborepo-lib/Cargo.toml index 475dc0e44eb3a..4927fc9a36775 100644 --- a/crates/turborepo-lib/Cargo.toml +++ b/crates/turborepo-lib/Cargo.toml @@ -34,6 +34,7 @@ workspace = true [dependencies] atty = { workspace = true } +axum = { workspace = true } biome_deserialize = { workspace = true } biome_diagnostics = { workspace = true } biome_json_parser = { workspace = true } From e7f33974cd6a2e9acb7a42787854bf407f886c3c Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:31:54 +0100 Subject: [PATCH 06/11] fix warnings --- crates/turborepo-auth/src/auth/login.rs | 2 -- crates/turborepo-auth/src/auth/sso.rs | 2 -- crates/turborepo-cache/src/cache_archive/create.rs | 2 +- crates/turborepo-ci/src/lib.rs | 1 - crates/turborepo-fs/src/lib.rs | 2 +- crates/turborepo-lib/src/daemon/connector.rs | 3 +-- crates/turborepo-repository/src/package_graph/builder.rs | 2 -- .../turborepo-repository/src/package_graph/dep_splitter.rs | 2 +- crates/turborepo-repository/src/package_json.rs | 1 - crates/turborepo-repository/src/package_manager/mod.rs | 1 - crates/turborepo-scm/src/package_deps.rs | 6 +++--- crates/turborepo-ui/src/tui/pane.rs | 2 +- crates/turborepo-vt100/tests/attr.rs | 2 -- crates/turborepo-vt100/tests/mode.rs | 2 -- crates/turborepo-vt100/tests/osc.rs | 2 -- crates/turborepo-vt100/tests/processing.rs | 2 -- crates/turborepo-vt100/tests/quickcheck.rs | 2 -- crates/turborepo-vt100/tests/text.rs | 2 -- crates/turborepo-wax/src/walk/mod.rs | 2 +- crates/turborepo-wax/tests/walk.rs | 2 +- packages/turbo-repository/rust/src/internal.rs | 2 -- 21 files changed, 10 insertions(+), 34 deletions(-) diff --git a/crates/turborepo-auth/src/auth/login.rs b/crates/turborepo-auth/src/auth/login.rs index d2201c5e97a02..08ca92baf2bb3 100644 --- a/crates/turborepo-auth/src/auth/login.rs +++ b/crates/turborepo-auth/src/auth/login.rs @@ -141,8 +141,6 @@ mod tests { use async_trait::async_trait; use reqwest::{Method, RequestBuilder, Response}; - use turborepo_api_client::Client; - use turborepo_ui::UI; use turborepo_vercel_api::{ CachingStatus, CachingStatusResponse, Membership, Role, SpacesResponse, Team, TeamsResponse, User, UserResponse, VerifiedSsoUser, diff --git a/crates/turborepo-auth/src/auth/sso.rs b/crates/turborepo-auth/src/auth/sso.rs index 23d41d2baf267..eeca53e29ab78 100644 --- a/crates/turborepo-auth/src/auth/sso.rs +++ b/crates/turborepo-auth/src/auth/sso.rs @@ -143,8 +143,6 @@ mod tests { use async_trait::async_trait; use reqwest::{Method, RequestBuilder, Response}; - use turborepo_api_client::Client; - use turborepo_ui::UI; use turborepo_vercel_api::{ CachingStatus, CachingStatusResponse, Membership, Role, SpacesResponse, Team, TeamsResponse, User, UserResponse, VerifiedSsoUser, diff --git a/crates/turborepo-cache/src/cache_archive/create.rs b/crates/turborepo-cache/src/cache_archive/create.rs index 861b3c9957bc2..a63de864de958 100644 --- a/crates/turborepo-cache/src/cache_archive/create.rs +++ b/crates/turborepo-cache/src/cache_archive/create.rs @@ -164,7 +164,7 @@ mod tests { use anyhow::Result; use tempfile::tempdir; use test_case::test_case; - use turbopath::{AbsoluteSystemPath, AbsoluteSystemPathBuf, AnchoredSystemPathBuf}; + use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPathBuf}; use super::*; use crate::cache_archive::restore::CacheReader; diff --git a/crates/turborepo-ci/src/lib.rs b/crates/turborepo-ci/src/lib.rs index 65438e0bcbc3a..5e4428f9b2276 100644 --- a/crates/turborepo-ci/src/lib.rs +++ b/crates/turborepo-ci/src/lib.rs @@ -98,7 +98,6 @@ mod tests { use tracing::info; use super::*; - use crate::Vendor; fn get_vendor(name: &str) -> Vendor { for v in get_vendors() { diff --git a/crates/turborepo-fs/src/lib.rs b/crates/turborepo-fs/src/lib.rs index 503e3225e33aa..06fc7d4bf065f 100644 --- a/crates/turborepo-fs/src/lib.rs +++ b/crates/turborepo-fs/src/lib.rs @@ -117,7 +117,7 @@ fn copy_file_with_type( #[cfg(test)] mod tests { - use std::{io, path::Path}; + use std::path::Path; use turbopath::AbsoluteSystemPathBuf; diff --git a/crates/turborepo-lib/src/daemon/connector.rs b/crates/turborepo-lib/src/daemon/connector.rs index 094b76661d992..59267bf3cff08 100644 --- a/crates/turborepo-lib/src/daemon/connector.rs +++ b/crates/turborepo-lib/src/daemon/connector.rs @@ -411,7 +411,6 @@ enum WaitAction { mod test { use std::assert_matches::assert_matches; - use sysinfo::Pid; use tokio::{ select, sync::{oneshot::Sender, Mutex}, @@ -425,7 +424,7 @@ mod test { use super::*; use crate::daemon::{ default_timeout_layer::DefaultTimeoutLayer, - proto::{self, turbod_client::TurbodClient, PackageChangesRequest}, + proto::{self, PackageChangesRequest}, }; #[cfg(not(target_os = "windows"))] diff --git a/crates/turborepo-repository/src/package_graph/builder.rs b/crates/turborepo-repository/src/package_graph/builder.rs index 8afa8e9706cf4..d4a3ea7ac3f32 100644 --- a/crates/turborepo-repository/src/package_graph/builder.rs +++ b/crates/turborepo-repository/src/package_graph/builder.rs @@ -593,8 +593,6 @@ impl PackageInfo { mod test { use std::assert_matches::assert_matches; - use turbopath::AbsoluteSystemPathBuf; - use super::*; struct MockDiscovery; diff --git a/crates/turborepo-repository/src/package_graph/dep_splitter.rs b/crates/turborepo-repository/src/package_graph/dep_splitter.rs index 7ba43b5293cb0..02cca9fcd04d2 100644 --- a/crates/turborepo-repository/src/package_graph/dep_splitter.rs +++ b/crates/turborepo-repository/src/package_graph/dep_splitter.rs @@ -206,7 +206,7 @@ impl<'a> fmt::Display for DependencyVersion<'a> { #[cfg(test)] mod test { use test_case::test_case; - use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPathBuf}; + use turbopath::AbsoluteSystemPathBuf; use super::*; use crate::package_json::PackageJson; diff --git a/crates/turborepo-repository/src/package_json.rs b/crates/turborepo-repository/src/package_json.rs index b717e22433606..982397217c047 100644 --- a/crates/turborepo-repository/src/package_json.rs +++ b/crates/turborepo-repository/src/package_json.rs @@ -93,7 +93,6 @@ impl FromStr for PackageJson { #[cfg(test)] mod test { - use anyhow::Result; use pretty_assertions::assert_eq; use serde_json::json; use test_case::test_case; diff --git a/crates/turborepo-repository/src/package_manager/mod.rs b/crates/turborepo-repository/src/package_manager/mod.rs index 0a031ff26d705..1c4e7fb862c1e 100644 --- a/crates/turborepo-repository/src/package_manager/mod.rs +++ b/crates/turborepo-repository/src/package_manager/mod.rs @@ -602,7 +602,6 @@ mod tests { use pretty_assertions::assert_eq; use tempfile::tempdir; - use turbopath::AbsoluteSystemPathBuf; use super::*; diff --git a/crates/turborepo-scm/src/package_deps.rs b/crates/turborepo-scm/src/package_deps.rs index dbc62b5c021ea..3227c1fb19a23 100644 --- a/crates/turborepo-scm/src/package_deps.rs +++ b/crates/turborepo-scm/src/package_deps.rs @@ -291,12 +291,12 @@ impl Git { #[cfg(test)] mod tests { - use std::{assert_matches::assert_matches, collections::HashMap, process::Command}; + use std::{assert_matches::assert_matches, process::Command}; - use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPathBuf, RelativeUnixPathBuf}; + use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPathBuf}; use super::*; - use crate::{manual::get_package_file_hashes_without_git, SCM}; + use crate::manual::get_package_file_hashes_without_git; fn tmp_dir() -> (tempfile::TempDir, AbsoluteSystemPathBuf) { let tmp_dir = tempfile::tempdir().unwrap(); diff --git a/crates/turborepo-ui/src/tui/pane.rs b/crates/turborepo-ui/src/tui/pane.rs index 2a0523ae82d62..b1e43e1a4d0a7 100644 --- a/crates/turborepo-ui/src/tui/pane.rs +++ b/crates/turborepo-ui/src/tui/pane.rs @@ -237,7 +237,7 @@ mod test { // Used by assert_buffer_eq #[allow(unused_imports)] use indoc::indoc; - use ratatui::{assert_buffer_eq, buffer::Buffer, layout::Rect, style::Style}; + use ratatui::{assert_buffer_eq, buffer::Buffer, layout::Rect}; use super::*; diff --git a/crates/turborepo-vt100/tests/attr.rs b/crates/turborepo-vt100/tests/attr.rs index 5668733a20a4e..0a1bf5fa3937d 100644 --- a/crates/turborepo-vt100/tests/attr.rs +++ b/crates/turborepo-vt100/tests/attr.rs @@ -1,5 +1,3 @@ -use turborepo_vt100 as vt100; - mod helpers; #[test] diff --git a/crates/turborepo-vt100/tests/mode.rs b/crates/turborepo-vt100/tests/mode.rs index 285ba1c2fc0cc..d09054da8b15a 100644 --- a/crates/turborepo-vt100/tests/mode.rs +++ b/crates/turborepo-vt100/tests/mode.rs @@ -1,5 +1,3 @@ -use turborepo_vt100 as vt100; - mod helpers; #[test] diff --git a/crates/turborepo-vt100/tests/osc.rs b/crates/turborepo-vt100/tests/osc.rs index 5c24f4975bddd..8a7ec429d1f13 100644 --- a/crates/turborepo-vt100/tests/osc.rs +++ b/crates/turborepo-vt100/tests/osc.rs @@ -1,5 +1,3 @@ -use turborepo_vt100 as vt100; - mod helpers; #[test] diff --git a/crates/turborepo-vt100/tests/processing.rs b/crates/turborepo-vt100/tests/processing.rs index 472c0623ca234..f109e48c450ee 100644 --- a/crates/turborepo-vt100/tests/processing.rs +++ b/crates/turborepo-vt100/tests/processing.rs @@ -1,5 +1,3 @@ -use turborepo_vt100 as vt100; - mod helpers; #[test] diff --git a/crates/turborepo-vt100/tests/quickcheck.rs b/crates/turborepo-vt100/tests/quickcheck.rs index 9d1fa1a90f6dc..56109349a933d 100644 --- a/crates/turborepo-vt100/tests/quickcheck.rs +++ b/crates/turborepo-vt100/tests/quickcheck.rs @@ -1,5 +1,3 @@ -use turborepo_vt100 as vt100; - use quickcheck::Arbitrary as _; mod helpers; diff --git a/crates/turborepo-vt100/tests/text.rs b/crates/turborepo-vt100/tests/text.rs index 71615fcdf570e..e41310075ba68 100644 --- a/crates/turborepo-vt100/tests/text.rs +++ b/crates/turborepo-vt100/tests/text.rs @@ -1,5 +1,3 @@ -use turborepo_vt100 as vt100; - mod helpers; #[test] diff --git a/crates/turborepo-wax/src/walk/mod.rs b/crates/turborepo-wax/src/walk/mod.rs index 71696a454081d..3afe288f37987 100644 --- a/crates/turborepo-wax/src/walk/mod.rs +++ b/crates/turborepo-wax/src/walk/mod.rs @@ -1084,7 +1084,7 @@ mod tests { use build_fs_tree::{dir, file, Build, FileSystemTree}; use path_slash::PathBufExt; - use tempfile::{self, TempDir}; + use tempfile::TempDir; use crate::{ walk::{ diff --git a/crates/turborepo-wax/tests/walk.rs b/crates/turborepo-wax/tests/walk.rs index 44398fd8adf94..bb7c926a09e44 100644 --- a/crates/turborepo-wax/tests/walk.rs +++ b/crates/turborepo-wax/tests/walk.rs @@ -3,7 +3,7 @@ use std::{collections::HashSet, path::PathBuf}; use build_fs_tree::{dir, file, Build, FileSystemTree}; -use tempfile::{self, TempDir}; +use tempfile::TempDir; use wax::{ walk::{Entry, FileIterator, WalkBehavior}, Glob, diff --git a/packages/turbo-repository/rust/src/internal.rs b/packages/turbo-repository/rust/src/internal.rs index 474137e110b58..8683a8670fc76 100644 --- a/packages/turbo-repository/rust/src/internal.rs +++ b/packages/turbo-repository/rust/src/internal.rs @@ -1,5 +1,3 @@ -use std::result::Result; - use napi::Status; use thiserror::Error; use turbopath::{AbsoluteSystemPathBuf, PathError}; From 5d2758695042fadd7ca7bb44da3f57f91315cc8e Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:32:13 +0100 Subject: [PATCH 07/11] update simd --- Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index d4a9d9a33d92b..a2de2fa1c89a6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -97,8 +97,8 @@ inherits = "release" strip = true [patch.crates-io] -# temporary patch until https://github.com/servo/pathfinder/pull/548 gets released. -pathfinder_simd = { git = "https://github.com/servo/pathfinder.git", rev = "e4fcda0d5259d0acf902aee6de7d2501f2bd6629" } +# temporary patch until https://github.com/servo/pathfinder/pull/557 gets released. +pathfinder_simd = { git = "https://github.com/servo/pathfinder.git", rev = "30419d07660dc11a21e42ef4a7fa329600cff152" } # Declare dependencies used across workspace packages requires single version bump. # ref: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#inheriting-a-dependency-from-a-workspace From 619d6e986d66ca0c10d300f39ca0ac1fe823b121 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 18 Mar 2024 18:50:19 +0100 Subject: [PATCH 08/11] fix warnings --- crates/turborepo-lib/src/run/scope/filter.rs | 15 +++++++-------- crates/turborepo-lockfiles/src/lib.rs | 2 ++ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/crates/turborepo-lib/src/run/scope/filter.rs b/crates/turborepo-lib/src/run/scope/filter.rs index c8f8cb434270e..962e53484a639 100644 --- a/crates/turborepo-lib/src/run/scope/filter.rs +++ b/crates/turborepo-lib/src/run/scope/filter.rs @@ -37,7 +37,7 @@ impl PackageInference { pub fn calculate( turbo_root: &AbsoluteSystemPath, pkg_inference_path: &AnchoredSystemPathBuf, - pkg_graph: &package_graph::PackageGraph, + pkg_graph: &PackageGraph, ) -> Self { debug!( "Using {} as a basis for selecting packages", @@ -78,16 +78,15 @@ impl PackageInference { }; if let Some(name) = &self.package_name { - name.clone_into(&mut selector.name_pattern); + selector.name_pattern.clone_from(name); } - if selector.parent_dir != turbopath::AnchoredSystemPathBuf::default() { + if selector.parent_dir != AnchoredSystemPathBuf::default() { let repo_relative_parent_dir = self.directory_root.join(&selector.parent_dir); - let clean_parent_dir = - path_clean::clean(std::path::Path::new(repo_relative_parent_dir.as_path())) - .into_os_string() - .into_string() - .expect("path was valid utf8 before cleaning"); + let clean_parent_dir = path_clean::clean(Path::new(repo_relative_parent_dir.as_path())) + .into_os_string() + .into_string() + .expect("path was valid utf8 before cleaning"); selector.parent_dir = AnchoredSystemPathBuf::try_from(clean_parent_dir.as_str()) .expect("path wasn't absolute before cleaning"); } else if self.package_name.is_none() { diff --git a/crates/turborepo-lockfiles/src/lib.rs b/crates/turborepo-lockfiles/src/lib.rs index ee7def154db0e..e62d0b35e32ff 100644 --- a/crates/turborepo-lockfiles/src/lib.rs +++ b/crates/turborepo-lockfiles/src/lib.rs @@ -1,5 +1,7 @@ #![feature(trait_upcasting)] #![deny(clippy::all)] +// the pest proc macro adds an empty doc comment. +#![allow(clippy::empty_docs)] mod berry; mod bun; From c2171bcbb0b017d1d0bc3686234e86f1afe75d71 Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:13:51 +0200 Subject: [PATCH 09/11] duplicate patch --- Cargo.toml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index a2de2fa1c89a6..0bcc41008b0a1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -96,10 +96,6 @@ opt-level = "z" inherits = "release" strip = true -[patch.crates-io] -# temporary patch until https://github.com/servo/pathfinder/pull/557 gets released. -pathfinder_simd = { git = "https://github.com/servo/pathfinder.git", rev = "30419d07660dc11a21e42ef4a7fa329600cff152" } - # Declare dependencies used across workspace packages requires single version bump. # ref: https://doc.rust-lang.org/cargo/reference/specifying-dependencies.html#inheriting-a-dependency-from-a-workspace [workspace.dependencies] From c2e9692c7227f42e07f8e36cab7e732800921ffb Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 8 Apr 2024 15:29:34 +0200 Subject: [PATCH 10/11] fix warnings --- crates/turborepo-lib/src/run/scope/filter.rs | 1 - crates/turborepo-lockfiles/src/pnpm/data.rs | 2 -- crates/turborepo-scm/src/git.rs | 2 +- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/crates/turborepo-lib/src/run/scope/filter.rs b/crates/turborepo-lib/src/run/scope/filter.rs index 962e53484a639..14081acccdf46 100644 --- a/crates/turborepo-lib/src/run/scope/filter.rs +++ b/crates/turborepo-lib/src/run/scope/filter.rs @@ -606,7 +606,6 @@ mod test { use test_case::test_case; use turbopath::{AbsoluteSystemPathBuf, AnchoredSystemPathBuf, RelativeUnixPathBuf}; use turborepo_repository::{ - change_mapper::ChangeMapError, discovery::PackageDiscovery, package_graph::{PackageGraph, PackageName, ROOT_PKG_NAME}, package_json::PackageJson, diff --git a/crates/turborepo-lockfiles/src/pnpm/data.rs b/crates/turborepo-lockfiles/src/pnpm/data.rs index bc93c159f0f24..618f8d7f24f3c 100644 --- a/crates/turborepo-lockfiles/src/pnpm/data.rs +++ b/crates/turborepo-lockfiles/src/pnpm/data.rs @@ -605,8 +605,6 @@ mod tests { const PNPM_V7_PEER: &[u8] = include_bytes!("../../fixtures/pnpm-v7-peer.yaml").as_slice(); const PNPM_V7_PATCH: &[u8] = include_bytes!("../../fixtures/pnpm-v7-patch.yaml").as_slice(); - use std::any::Any; - use super::*; use crate::{Lockfile, Package}; diff --git a/crates/turborepo-scm/src/git.rs b/crates/turborepo-scm/src/git.rs index 109a6163816d7..3b8b5a8b24494 100644 --- a/crates/turborepo-scm/src/git.rs +++ b/crates/turborepo-scm/src/git.rs @@ -452,7 +452,7 @@ mod tests { // Create a file nested in subdir fs::create_dir_all(repo_root.path().join("subdir"))?; let new_file = repo_root.path().join("subdir").join("baz.js"); - fs::write(&new_file, "let x = 2;")?; + fs::write(new_file, "let x = 2;")?; // The new directory and files are not yet committed, they shouldn't show up. let files = changed_files( From 110bfc08265a31c8df19cc83fc88dca2486a898c Mon Sep 17 00:00:00 2001 From: hrmny <8845940+ForsakenHarmony@users.noreply.github.com> Date: Mon, 8 Apr 2024 16:30:08 +0200 Subject: [PATCH 11/11] more unused deps --- Cargo.lock | 124 +++++++++---------------- crates/turbopack-browser/Cargo.toml | 1 - crates/turbopack-cli-utils/Cargo.toml | 1 - crates/turbopack-node/Cargo.toml | 6 +- crates/turbopack-resolve/Cargo.toml | 4 - crates/turbopack/Cargo.toml | 1 - crates/turborepo-filewatch/Cargo.toml | 1 - crates/turborepo-lib/Cargo.toml | 2 - crates/turborepo-repository/Cargo.toml | 1 - 9 files changed, 49 insertions(+), 92 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 8cda61e6e3483..aa6d2a85f4c1c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1346,7 +1346,7 @@ dependencies = [ "chromiumoxide_types", "dunce", "fnv", - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "pin-project-lite", "serde", @@ -1650,7 +1650,7 @@ dependencies = [ "console-api", "crossbeam-channel", "crossbeam-utils 0.8.16", - "futures 0.3.28", + "futures 0.3.30", "hdrhistogram", "humantime", "prost-types", @@ -1989,7 +1989,7 @@ dependencies = [ "ciborium", "clap 3.2.23", "criterion-plot", - "futures 0.3.28", + "futures 0.3.30", "itertools 0.10.5", "lazy_static", "num-traits", @@ -2494,15 +2494,6 @@ dependencies = [ "subtle", ] -[[package]] -name = "directories" -version = "4.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210" -dependencies = [ - "dirs-sys 0.3.7", -] - [[package]] name = "directories" version = "5.0.1" @@ -3013,9 +3004,9 @@ checksum = "3a471a38ef8ed83cd6e40aa59c1ffe17db6855c18e3604d9c4ed8c08ebc28678" [[package]] name = "futures" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23342abe12aba583913b2e62f22225ff9c950774065e4bfb61a19cd9770fec40" +checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0" dependencies = [ "futures-channel", "futures-core", @@ -3028,9 +3019,9 @@ dependencies = [ [[package]] name = "futures-channel" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955518d47e09b25bbebc7a18df10b81f0c766eaf4c4f1cccef2fca5f2a4fb5f2" +checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78" dependencies = [ "futures-core", "futures-sink", @@ -3044,9 +3035,9 @@ checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d" [[package]] name = "futures-executor" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ccecee823288125bd88b4d7f565c9e58e41858e47ab72e8ea2d64e93624386e0" +checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d" dependencies = [ "futures-core", "futures-task", @@ -3055,9 +3046,9 @@ dependencies = [ [[package]] name = "futures-io" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fff74096e71ed47f8e023204cfd0aa1289cd54ae5430a9523be060cdb849964" +checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1" [[package]] name = "futures-lite" @@ -3076,9 +3067,9 @@ dependencies = [ [[package]] name = "futures-macro" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "89ca545a94061b6365f2c7355b4b32bd20df3ff95f02da9329b34ccc3bd6ee72" +checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", @@ -3091,22 +3082,22 @@ version = "0.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fde5a672a61f96552aa5ed9fd9c81c3fbdae4be9b1e205d6eaf17c83705adc0f" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "pin-project-lite", "tokio", ] [[package]] name = "futures-sink" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f43be4fe21a13b9781a69afa4985b0f6ee0e1afab2c6f454a8cf30e2b2237b6e" +checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5" [[package]] name = "futures-task" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76d3d132be6c0e6aa1534069c705a74a5997a356c0dc2f86a47765e5617c5b65" +checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004" [[package]] name = "futures-timer" @@ -3116,9 +3107,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c" [[package]] name = "futures-util" -version = "0.3.28" +version = "0.3.30" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "26b01e40b772d54cf6c6d721c1d1abd0647a0106a12ecaa1c186273392a69533" +checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48" dependencies = [ "futures-channel", "futures-core", @@ -3287,7 +3278,7 @@ dependencies = [ name = "globwatch" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "itertools 0.10.5", "merge-streams", "notify", @@ -3928,15 +3919,6 @@ dependencies = [ "syn 2.0.32", ] -[[package]] -name = "intervaltree" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "270bc34e57047cab801a8c871c124d9dc7132f6473c6401f645524f4e6edd111" -dependencies = [ - "smallvec 1.13.1", -] - [[package]] name = "io-lifetimes" version = "1.0.11" @@ -6827,7 +6809,7 @@ version = "0.16.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b07f2d176c472198ec1e6551dc7da28f1c089652f66a7b722676c2238ebc0edf" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "futures-timer", "rstest_macros", "rustc_version 0.4.0", @@ -7026,7 +7008,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4ed36cdb20de66d89a17ea04b8883fc7a386f2cf877aaedca5005583ce4876ff" dependencies = [ "crossbeam-channel", - "futures 0.3.28", + "futures 0.3.30", "futures-channel", "futures-executor", "num_cpus", @@ -9295,7 +9277,7 @@ checksum = "e3fe0f8743615139eed21376c94d8201be331040c8999e9a7c86a43d0ca2ff8b" dependencies = [ "anyhow", "enumset", - "futures 0.3.28", + "futures 0.3.30", "once_cell", "parking_lot 0.12.1", "serde", @@ -10225,7 +10207,7 @@ dependencies = [ "auto_impl", "bytes 1.5.0", "dashmap", - "futures 0.3.28", + "futures 0.3.30", "httparse", "lsp-types", "memchr", @@ -10479,7 +10461,7 @@ dependencies = [ "dashmap", "erased-serde", "event-listener", - "futures 0.3.28", + "futures 0.3.30", "indexmap 1.9.3", "mopa", "nohash-hasher", @@ -10516,7 +10498,7 @@ version = "0.1.0" dependencies = [ "anyhow", "bytes 1.5.0", - "futures 0.3.28", + "futures 0.3.30", "serde", "serde_bytes", "serde_test", @@ -10567,7 +10549,7 @@ dependencies = [ "criterion", "dashmap", "dunce", - "futures 0.3.28", + "futures 0.3.30", "futures-retry", "include_dir", "indexmap 1.9.3", @@ -10679,7 +10661,7 @@ version = "0.1.0" dependencies = [ "anyhow", "auto-hash-map", - "futures 0.3.28", + "futures 0.3.30", "lazy_static", "tokio", "turbo-tasks", @@ -10706,7 +10688,7 @@ dependencies = [ "async-recursion", "criterion", "difference", - "futures 0.3.28", + "futures 0.3.30", "indexmap 1.9.3", "lazy_static", "regex", @@ -10741,7 +10723,7 @@ dependencies = [ "anyhow", "chromiumoxide", "criterion", - "futures 0.3.28", + "futures 0.3.30", "nix 0.26.2", "once_cell", "owo-colors", @@ -10828,7 +10810,6 @@ dependencies = [ "turbo-tasks-build", "turbo-tasks-fs", "turbo-tasks-hash", - "turbopack", "turbopack-core", "turbopack-ecmascript", "turbopack-ecmascript-runtime", @@ -10845,7 +10826,7 @@ dependencies = [ "console-subscriber", "criterion", "dunce", - "futures 0.3.28", + "futures 0.3.30", "mime 0.3.17", "owo-colors", "regex", @@ -10889,7 +10870,6 @@ dependencies = [ "turbo-tasks-build", "turbo-tasks-fs", "turbopack-core", - "turbopack-ecmascript", "turbopack-resolve", ] @@ -10902,7 +10882,7 @@ dependencies = [ "async-trait", "auto-hash-map", "browserslist-rs", - "futures 0.3.28", + "futures 0.3.30", "indexmap 1.9.3", "lazy_static", "once_cell", @@ -10970,7 +10950,7 @@ dependencies = [ "anyhow", "async-compression", "auto-hash-map", - "futures 0.3.28", + "futures 0.3.30", "hyper 0.14.28", "hyper-tungstenite", "indexmap 1.9.3", @@ -11153,7 +11133,7 @@ dependencies = [ "async-stream", "async-trait", "const_format", - "futures 0.3.28", + "futures 0.3.30", "futures-retry", "indexmap 1.9.3", "indoc", @@ -11164,7 +11144,6 @@ dependencies = [ "regex", "serde", "serde_json", - "serde_qs", "tokio", "tracing", "turbo-tasks", @@ -11177,8 +11156,6 @@ dependencies = [ "turbopack-dev-server", "turbopack-ecmascript", "turbopack-resolve", - "url 2.4.1", - "urlencoding", ] [[package]] @@ -11205,18 +11182,14 @@ name = "turbopack-resolve" version = "0.1.0" dependencies = [ "anyhow", - "async-recursion", - "futures 0.3.28", "indexmap 1.9.3", "lazy_static", "regex", "serde", "serde_json", - "tokio", "tracing", "turbo-tasks", "turbo-tasks-build", - "turbo-tasks-env", "turbo-tasks-fs", "turbopack-core", ] @@ -11269,7 +11242,7 @@ version = "0.1.0" dependencies = [ "anyhow", "dunce", - "futures 0.3.28", + "futures 0.3.30", "once_cell", "serde", "serde_json", @@ -11366,7 +11339,7 @@ name = "turborepo-analytics" version = "0.1.0" dependencies = [ "async-trait", - "futures 0.3.28", + "futures 0.3.30", "thiserror", "tokio", "tracing", @@ -11437,7 +11410,7 @@ dependencies = [ "anyhow", "base64 0.21.4", "camino", - "futures 0.3.28", + "futures 0.3.30", "hmac", "libc", "os_str_bytes", @@ -11507,8 +11480,7 @@ version = "0.1.0" dependencies = [ "bitflags 1.3.2", "fsevent-sys", - "futures 0.3.28", - "itertools 0.10.5", + "futures 0.3.30", "libc", "notify", "tempfile", @@ -11538,7 +11510,7 @@ dependencies = [ name = "turborepo-graph-utils" version = "0.1.0" dependencies = [ - "futures 0.3.28", + "futures 0.3.30", "itertools 0.10.5", "log 0.4.20", "petgraph", @@ -11574,11 +11546,10 @@ dependencies = [ "crossterm 0.26.1", "ctrlc", "dialoguer", - "directories 4.0.1", "dirs-next", "dunce", "either", - "futures 0.3.28", + "futures 0.3.30", "futures-core", "globwalk", "globwatch", @@ -11586,8 +11557,6 @@ dependencies = [ "hex", "humantime", "ignore", - "indicatif", - "is-terminal", "itertools 0.10.5", "jsonc-parser 0.21.0", "lazy_static", @@ -11742,7 +11711,6 @@ dependencies = [ "turbopath", "turborepo-graph-utils", "turborepo-lockfiles", - "turborepo-scm", "wax", "which", ] @@ -11775,7 +11743,7 @@ dependencies = [ "async-trait", "chrono", "config", - "futures 0.3.28", + "futures 0.3.30", "hex", "once_cell", "reqwest", @@ -12058,7 +12026,7 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2f8811797a24ff123db3c6e1087aa42551d03d772b3724be421ad063da1f5f3f" dependencies = [ - "directories 5.0.1", + "directories", "reqwest", "semver 1.0.18", "serde", @@ -12212,7 +12180,7 @@ dependencies = [ "derivative", "filetime", "fs_extra", - "futures 0.3.28", + "futures 0.3.30", "getrandom", "indexmap 1.9.3", "lazy_static", @@ -12236,7 +12204,7 @@ dependencies = [ "async-trait", "bytes 1.5.0", "derivative", - "futures 0.3.28", + "futures 0.3.30", "mio 0.8.8", "serde", "socket2 0.4.9", @@ -12706,7 +12674,7 @@ dependencies = [ "cooked-waker", "dashmap", "derivative", - "futures 0.3.28", + "futures 0.3.30", "getrandom", "heapless", "hex", diff --git a/crates/turbopack-browser/Cargo.toml b/crates/turbopack-browser/Cargo.toml index 44e1224610e41..6bdbf326f71f4 100644 --- a/crates/turbopack-browser/Cargo.toml +++ b/crates/turbopack-browser/Cargo.toml @@ -31,7 +31,6 @@ urlencoding = { workspace = true } turbo-tasks = { workspace = true } turbo-tasks-fs = { workspace = true } turbo-tasks-hash = { workspace = true } -turbopack = { workspace = true } turbopack-core = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-ecmascript-runtime = { workspace = true } diff --git a/crates/turbopack-cli-utils/Cargo.toml b/crates/turbopack-cli-utils/Cargo.toml index 68e90ae3c3b12..079f6d851f8de 100644 --- a/crates/turbopack-cli-utils/Cargo.toml +++ b/crates/turbopack-cli-utils/Cargo.toml @@ -23,7 +23,6 @@ serde = { workspace = true, features = ["derive"] } turbo-tasks = { workspace = true } turbo-tasks-fs = { workspace = true } turbopack-core = { workspace = true } -turbopack-ecmascript = { workspace = true } turbopack-resolve = { workspace = true } [build-dependencies] diff --git a/crates/turbopack-node/Cargo.toml b/crates/turbopack-node/Cargo.toml index 31ddec72d9762..220319306fe60 100644 --- a/crates/turbopack-node/Cargo.toml +++ b/crates/turbopack-node/Cargo.toml @@ -32,7 +32,7 @@ parking_lot = { workspace = true } regex = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -serde_qs = { workspace = true } +#serde_qs = { workspace = true } tokio = { workspace = true, features = ["full"] } tracing = { workspace = true } turbo-tasks = { workspace = true } @@ -44,8 +44,8 @@ turbopack-core = { workspace = true } turbopack-dev-server = { workspace = true } turbopack-ecmascript = { workspace = true } turbopack-resolve = { workspace = true } -url = { workspace = true } -urlencoding = { workspace = true } +#url = { workspace = true } +#urlencoding = { workspace = true } [build-dependencies] turbo-tasks-build = { workspace = true } diff --git a/crates/turbopack-resolve/Cargo.toml b/crates/turbopack-resolve/Cargo.toml index 51b1798d6943a..8c26ee81ff2d9 100644 --- a/crates/turbopack-resolve/Cargo.toml +++ b/crates/turbopack-resolve/Cargo.toml @@ -14,17 +14,13 @@ workspace = true [dependencies] anyhow = { workspace = true } -async-recursion = { workspace = true } -futures = { workspace = true } indexmap = { workspace = true, features = ["serde"] } lazy_static = { workspace = true } regex = { workspace = true } serde = { workspace = true } serde_json = { workspace = true } -tokio = { workspace = true } tracing = { workspace = true } turbo-tasks = { workspace = true } -turbo-tasks-env = { workspace = true } turbo-tasks-fs = { workspace = true } turbopack-core = { workspace = true } diff --git a/crates/turbopack/Cargo.toml b/crates/turbopack/Cargo.toml index 28f080d694316..ff161cc2c61c2 100644 --- a/crates/turbopack/Cargo.toml +++ b/crates/turbopack/Cargo.toml @@ -19,7 +19,6 @@ workspace = true [dependencies] anyhow = { workspace = true } async-recursion = { workspace = true } -futures = { workspace = true } indexmap = { workspace = true, features = ["serde"] } lazy_static = { workspace = true } regex = { workspace = true } diff --git a/crates/turborepo-filewatch/Cargo.toml b/crates/turborepo-filewatch/Cargo.toml index bd21f7fab19ec..10e72c006c243 100644 --- a/crates/turborepo-filewatch/Cargo.toml +++ b/crates/turborepo-filewatch/Cargo.toml @@ -11,7 +11,6 @@ workspace = true [dependencies] futures = { version = "0.3.26" } -itertools = { workspace = true } notify = { workspace = true } thiserror = "1.0.38" tokio = { workspace = true, features = ["full", "time"] } diff --git a/crates/turborepo-lib/Cargo.toml b/crates/turborepo-lib/Cargo.toml index 4927fc9a36775..b34a684da6721 100644 --- a/crates/turborepo-lib/Cargo.toml +++ b/crates/turborepo-lib/Cargo.toml @@ -51,7 +51,6 @@ convert_case = "0.6.0" crossterm = "0.26" ctrlc = { version = "3.4.0", features = ["termination"] } dialoguer = { workspace = true, features = ["fuzzy-select"] } -directories = "4.0.1" dirs-next = "2.0.0" dunce = { workspace = true } either = { workspace = true } @@ -63,7 +62,6 @@ go-parse-duration = "0.1.1" hex = "0.4.3" humantime = "2.1.0" ignore = "0.4.22" -indicatif = { workspace = true } itertools = { workspace = true } jsonc-parser = { version = "0.21.0" } lazy_static = { workspace = true } diff --git a/crates/turborepo-repository/Cargo.toml b/crates/turborepo-repository/Cargo.toml index 9fd30d0544193..213a115e65006 100644 --- a/crates/turborepo-repository/Cargo.toml +++ b/crates/turborepo-repository/Cargo.toml @@ -27,7 +27,6 @@ tracing.workspace = true turbopath = { workspace = true } turborepo-graph-utils = { path = "../turborepo-graph-utils" } turborepo-lockfiles = { workspace = true } -turborepo-scm = { workspace = true } wax = { workspace = true } which = { workspace = true }