diff --git a/Cargo.lock b/Cargo.lock index 49796e4a7..3b60210a4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1535,7 +1535,6 @@ dependencies = [ "mimalloc", "oxc_allocator", "oxc_diagnostics", - "oxc_index", "oxc_linter", "oxc_parser", "oxc_span", @@ -1589,7 +1588,6 @@ dependencies = [ name = "oxc_formatter" version = "0.1.1" dependencies = [ - "miette", "oxc_allocator", "oxc_ast", "oxc_parser", @@ -1626,7 +1624,6 @@ dependencies = [ name = "oxc_linter" version = "0.0.0" dependencies = [ - "dashmap", "insta", "itertools 0.11.0", "lazy_static", @@ -1776,7 +1773,6 @@ dependencies = [ "rustc-hash", "serde", "serde_json", - "static_assertions", "tracing", "tracing-subscriber", "vfs", @@ -1836,7 +1832,6 @@ name = "oxc_type_synthesis" version = "0.0.0" dependencies = [ "ezno-checker", - "miette", "oxc_allocator", "oxc_ast", "oxc_parser", @@ -1871,7 +1866,6 @@ name = "oxc_wasm" version = "0.0.0" dependencies = [ "console_error_panic_hook", - "miette", "oxc_allocator", "oxc_ast", "oxc_ast_lower", diff --git a/Cargo.toml b/Cargo.toml index d4bbfd0cc..fe1843830 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ ignore = { version = "0.4.20" } itertools = { version = "0.11.0" } jemallocator = { version = "0.5.4" } lazy_static = { version = "1.4.0" } -miette = { version = "5.10.0" } +miette = { version = "5.10.0", features = ["fancy-no-backtrace"] } mimalloc = { version = "0.1.38" } nodejs-resolver = { version = "0.1.0" } num-bigint = { version = "0.4.3" } diff --git a/crates/oxc_cli/Cargo.toml b/crates/oxc_cli/Cargo.toml index f6b155961..6192c637c 100644 --- a/crates/oxc_cli/Cargo.toml +++ b/crates/oxc_cli/Cargo.toml @@ -25,7 +25,6 @@ mimalloc = { workspace = true } [dependencies] oxc_allocator = { workspace = true } oxc_diagnostics = { workspace = true } -oxc_index = { workspace = true } oxc_linter = { workspace = true } oxc_parser = { workspace = true } oxc_span = { workspace = true } @@ -35,7 +34,7 @@ oxc_type_synthesis = { workspace = true } codespan-reporting = "0.11.1" ignore = { workspace = true, features = ["simd-accel"] } -miette = { workspace = true, features = ["fancy-no-backtrace"] } +miette = { workspace = true } rayon = { workspace = true } bpaf = { workspace = true, features = ["derive", "autocomplete", "bright-color"] } diff --git a/crates/oxc_formatter/Cargo.toml b/crates/oxc_formatter/Cargo.toml index 15ce71748..781050c57 100644 --- a/crates/oxc_formatter/Cargo.toml +++ b/crates/oxc_formatter/Cargo.toml @@ -19,4 +19,3 @@ oxc_syntax = { workspace = true } [dev-dependencies] oxc_parser = { workspace = true } -miette = { workspace = true, features = ["fancy-no-backtrace"] } diff --git a/crates/oxc_linter/Cargo.toml b/crates/oxc_linter/Cargo.toml index 5ddc52abc..9c41945bb 100644 --- a/crates/oxc_linter/Cargo.toml +++ b/crates/oxc_linter/Cargo.toml @@ -31,11 +31,10 @@ rustc-hash = { workspace = true } phf = { workspace = true, features = ["macros"] } num-traits = { workspace = true } itertools = { workspace = true } -dashmap = { workspace = true } rust-lapper = "1.1.0" once_cell = "1.18.0" [dev-dependencies] -miette = { workspace = true, features = ["fancy-no-backtrace"] } +miette = { workspace = true } insta = { workspace = true } diff --git a/crates/oxc_parser/fuzz/Cargo.lock b/crates/oxc_parser/fuzz/Cargo.lock index f5d8d5241..65c4cc731 100644 --- a/crates/oxc_parser/fuzz/Cargo.lock +++ b/crates/oxc_parser/fuzz/Cargo.lock @@ -147,6 +147,12 @@ dependencies = [ "windows-sys", ] +[[package]] +name = "is_ci" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb" + [[package]] name = "itoa" version = "1.0.6" @@ -197,8 +203,15 @@ version = "5.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59bb584eaeeab6bd0226ccf3509a69d7936d148cf3d036ad350abe35e8c6856e" dependencies = [ + "is-terminal", "miette-derive", "once_cell", + "owo-colors", + "supports-color", + "supports-hyperlinks", + "supports-unicode", + "terminal_size", + "textwrap", "thiserror", "unicode-width", ] @@ -438,6 +451,34 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "supports-color" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4950e7174bffabe99455511c39707310e7e9b440364a2fcb1cc21521be57b354" +dependencies = [ + "is-terminal", + "is_ci", +] + +[[package]] +name = "supports-hyperlinks" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f84231692eb0d4d41e4cdd0cabfdd2e6cd9e255e65f80c9aa7c98dd502b4233d" +dependencies = [ + "is-terminal", +] + +[[package]] +name = "supports-unicode" +version = "2.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b6c2cb240ab5dd21ed4906895ee23fe5a48acdbd15a3ce388e7b62a9b66baf7" +dependencies = [ + "is-terminal", +] + [[package]] name = "syn" version = "2.0.29" @@ -449,6 +490,16 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "terminal_size" +version = "0.1.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "633c1a546cee861a1a6d0dc69ebeca693bf4296661ba7852b9d21d159e0506df" +dependencies = [ + "libc", + "winapi", +] + [[package]] name = "textwrap" version = "0.15.0" @@ -520,6 +571,28 @@ version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "winapi" +version = "0.3.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +dependencies = [ + "winapi-i686-pc-windows-gnu", + "winapi-x86_64-pc-windows-gnu", +] + +[[package]] +name = "winapi-i686-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" + +[[package]] +name = "winapi-x86_64-pc-windows-gnu" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + [[package]] name = "windows-sys" version = "0.48.0" diff --git a/crates/oxc_resolver/Cargo.toml b/crates/oxc_resolver/Cargo.toml index a3325fd3a..7922e4fe5 100644 --- a/crates/oxc_resolver/Cargo.toml +++ b/crates/oxc_resolver/Cargo.toml @@ -30,5 +30,4 @@ once_cell = "1.18.0" [dev-dependencies] vfs = "0.9.0" # for testing with in memory file system -static_assertions = { workspace = true } tracing-subscriber = { workspace = true } diff --git a/crates/oxc_type_synthesis/Cargo.toml b/crates/oxc_type_synthesis/Cargo.toml index 73b1fc72f..cdad5e8ed 100644 --- a/crates/oxc_type_synthesis/Cargo.toml +++ b/crates/oxc_type_synthesis/Cargo.toml @@ -19,6 +19,3 @@ oxc_syntax = { workspace = true } oxc_allocator = { workspace = true } ezno-checker = { version = "=0.0.4" } - -[dev-dependencies] -miette = { workspace = true, features = ["fancy-no-backtrace"] } diff --git a/crates/oxc_wasm/Cargo.toml b/crates/oxc_wasm/Cargo.toml index 38645f54f..7d0548294 100644 --- a/crates/oxc_wasm/Cargo.toml +++ b/crates/oxc_wasm/Cargo.toml @@ -31,10 +31,7 @@ oxc_span = { workspace = true } oxc_query = { workspace = true } serde_json = { workspace = true } trustfall = { workspace = true } - - -miette = { workspace = true, features = ["fancy-no-backtrace"] } -serde = { workspace = true } +serde = { workspace = true } wasm-bindgen = { version = "0.2" } serde-wasm-bindgen = "0.5.0" diff --git a/tasks/benchmark/benches/minifier.rs b/tasks/benchmark/benches/minifier.rs index a873feb30..4915c4a38 100644 --- a/tasks/benchmark/benches/minifier.rs +++ b/tasks/benchmark/benches/minifier.rs @@ -27,5 +27,5 @@ fn bench_minifier(criterion: &mut Criterion) { group.finish(); } -criterion_group!(parser, bench_minifier); -criterion_main!(parser); +criterion_group!(minifier, bench_minifier); +criterion_main!(minifier); diff --git a/tasks/benchmark/benches/resolver.rs b/tasks/benchmark/benches/resolver.rs index 93b7e5155..6d2c61e2e 100644 --- a/tasks/benchmark/benches/resolver.rs +++ b/tasks/benchmark/benches/resolver.rs @@ -74,5 +74,5 @@ fn bench_resolver(c: &mut Criterion) { }); } -criterion_group!(benches, bench_resolver); -criterion_main!(benches); +criterion_group!(resolver, bench_resolver); +criterion_main!(resolver); diff --git a/tasks/benchmark/benches/semantic.rs b/tasks/benchmark/benches/semantic.rs index 814941e50..d408f8a96 100644 --- a/tasks/benchmark/benches/semantic.rs +++ b/tasks/benchmark/benches/semantic.rs @@ -35,5 +35,5 @@ fn bench_semantic(criterion: &mut Criterion) { group.finish(); } -criterion_group!(parser, bench_semantic); -criterion_main!(parser); +criterion_group!(semantic, bench_semantic); +criterion_main!(semantic);