diff --git a/Cargo.toml b/Cargo.toml index 64624b3..1a1ec9e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,40 +1,43 @@ [workspace] resolver = "3" members = [ - "fix", - "fix-bytecode", - "fix-compiler", - "fix-error", - "fix-lang", - "fix-runtime", - "fix-vm", + "fix", + "fix-bytecode", + "fix-compiler", + "fix-error", + "fix-lang", + "fix-runtime", + "fix-vm", ] -[profile.profiling] -inherits = "release" -debug = true - -[profile.lto] -inherits = "release" -lto = true - [workspace.dependencies] -bumpalo = { version = "3.20", features = [ +bumpalo = { + version = "3.20", + features = [ "allocator-api2", "boxed", "collections", -] } + ] +} +ere = "0.2" ghost-cell = "0.2" hashbrown = "0.16" +likely_stable = "0.1" num_enum = "0.7.5" -smallvec = { version = "1.15", features = ["const_new", "const_generics"] } -ere = "0.2" -string-interner = "0.19" rnix = "0.14" rowan = "0.16" -likely_stable = "0.1" +smallvec = { version = "1.15", features = ["const_generics", "const_new"] } +string-interner = "0.19" [workspace.dependencies.gc-arena] git = "https://github.com/kyren/gc-arena" rev = "75671ae03f53718357b741ed4027560f14e90836" features = ["allocator-api2", "hashbrown", "smallvec"] + +[profile.lto] +inherits = "release" +lto = true + +[profile.profiling] +inherits = "release" +debug = true diff --git a/fix-compiler/Cargo.toml b/fix-compiler/Cargo.toml index b36ab7c..09ad0c9 100644 --- a/fix-compiler/Cargo.toml +++ b/fix-compiler/Cargo.toml @@ -5,13 +5,13 @@ edition = "2024" [dependencies] bumpalo = { workspace = true } +colored = "3.1.1" ghost-cell = { workspace = true } hashbrown = { workspace = true } num_enum = { workspace = true } rnix = { workspace = true } rowan = { workspace = true } string-interner = { workspace = true } -colored = "3.1.1" fix-bytecode = { path = "../fix-bytecode" } fix-error = { path = "../fix-error" } diff --git a/fix-error/Cargo.toml b/fix-error/Cargo.toml index 952f918..c9cf658 100644 --- a/fix-error/Cargo.toml +++ b/fix-error/Cargo.toml @@ -5,5 +5,5 @@ edition = "2024" [dependencies] miette = { version = "7.6", features = ["fancy"] } -thiserror = "2.0" rnix = { workspace = true } +thiserror = "2.0" diff --git a/fix-lang/Cargo.toml b/fix-lang/Cargo.toml index 7ff8c6f..30f2dbf 100644 --- a/fix-lang/Cargo.toml +++ b/fix-lang/Cargo.toml @@ -4,7 +4,7 @@ version = "0.1.0" edition = "2024" [dependencies] +ere = { workspace = true } gc-arena = { workspace = true } num_enum = { workspace = true } string-interner = { workspace = true } -ere = { workspace = true } diff --git a/fix-runtime/Cargo.toml b/fix-runtime/Cargo.toml index 590bdd4..f21d87e 100644 --- a/fix-runtime/Cargo.toml +++ b/fix-runtime/Cargo.toml @@ -6,12 +6,12 @@ edition = "2024" [dependencies] gc-arena = { workspace = true } hashbrown = { workspace = true } +likely_stable = { workspace = true } num_enum = { workspace = true } smallvec = { workspace = true } -string-interner = { workspace = true } -likely_stable = { workspace = true } sptr = "0.3" +string-interner = { workspace = true } fix-bytecode = { path = "../fix-bytecode" } -fix-lang = { path = "../fix-lang" } fix-error = { path = "../fix-error" } +fix-lang = { path = "../fix-lang" } diff --git a/fix-vm/Cargo.toml b/fix-vm/Cargo.toml index 8dbe495..f59c2a2 100644 --- a/fix-vm/Cargo.toml +++ b/fix-vm/Cargo.toml @@ -3,20 +3,20 @@ name = "fix-vm" version = "0.1.0" edition = "2024" -[features] -tailcall = [] - [dependencies] gc-arena = { workspace = true } hashbrown = { workspace = true } +likely_stable = { workspace = true } num_enum = { workspace = true } smallvec = { workspace = true } -string-interner = { workspace = true } -likely_stable = { workspace = true } sptr = "0.3" +string-interner = { workspace = true } sysinfo = { version = "0.38", default-features = false, features = ["system"] } fix-bytecode = { path = "../fix-bytecode" } fix-error = { path = "../fix-error" } fix-lang = { path = "../fix-lang" } fix-runtime = { path = "../fix-runtime" } + +[features] +tailcall = [] diff --git a/fix/Cargo.toml b/fix/Cargo.toml index b452333..d874f62 100644 --- a/fix/Cargo.toml +++ b/fix/Cargo.toml @@ -3,6 +3,18 @@ name = "fix" version = "0.1.0" edition = "2024" +[[bench]] +harness = false +name = "basic_ops" + +[[bench]] +harness = false +name = "builtins" + +[[bench]] +harness = false +name = "thunk_scope" + [dependencies] mimalloc = "0.1" @@ -17,9 +29,9 @@ clap = { version = "4", features = ["derive"] } tracing = "0.1" tracing-subscriber = { version = "0.3", features = ["env-filter"] } +miette = { version = "7.4", features = ["fancy"] } # Error Reporting thiserror = "2" -miette = { version = "7.4", features = ["fancy"] } # Data Structure hashbrown = { workspace = true } @@ -38,15 +50,3 @@ fix-vm = { path = "../fix-vm" } criterion = { version = "0.8", features = ["html_reports"] } tempfile = "3.24" test-log = { version = "0.2", features = ["trace"] } - -[[bench]] -name = "basic_ops" -harness = false - -[[bench]] -name = "builtins" -harness = false - -[[bench]] -name = "thunk_scope" -harness = false diff --git a/flake.nix b/flake.nix index a959039..887d75f 100644 --- a/flake.nix +++ b/flake.nix @@ -47,6 +47,7 @@ just samply tokei + tombi # llm-agents.codex llm-agents.claude-code diff --git a/typos.toml b/typos.toml index 93588e8..0926273 100644 --- a/typos.toml +++ b/typos.toml @@ -1,7 +1,7 @@ [files] extend-exclude = [ - "nix-js/tests/tests/regex.rs", - "nix-js/tests/tests/lang", + "nix-js/tests/tests/regex.rs", + "nix-js/tests/tests/lang", ] [default.extend-words]