Skip to content

Commit

Permalink
Migrate to workspace deps (#3313)
Browse files Browse the repository at this point in the history
* Migrate to workspace deps

* cargo fmt
  • Loading branch information
jedel1043 authored Sep 27, 2023
1 parent 57604ae commit 940e603
Show file tree
Hide file tree
Showing 17 changed files with 234 additions and 1,189 deletions.
1,186 changes: 92 additions & 1,094 deletions Cargo.lock

Large diffs are not rendered by default.

66 changes: 57 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,63 @@ license = "Unlicense OR MIT"
description = "Boa is a Javascript lexer, parser and compiler written in Rust. Currently, it has support for some of the language."

[workspace.dependencies]
boa_ast = { version = "0.17.0", path = "boa_ast" }
boa_engine = { version = "0.17.0", path = "boa_engine" }
boa_gc = { version = "0.17.0", path = "boa_gc" }
boa_icu_provider = { version = "0.17.0", path = "boa_icu_provider" }
boa_interner = { version = "0.17.0", path = "boa_interner" }
boa_macros = { version = "0.17.0", path = "boa_macros" }
boa_parser = { version = "0.17.0", path = "boa_parser" }
boa_profiler = { version = "0.17.0", path = "boa_profiler" }
boa_runtime = { version = "0.17.0", path = "boa_runtime" }

# Repo Crates
boa_ast = { version = "~0.17.0", path = "boa_ast" }
boa_engine = { version = "~0.17.0", path = "boa_engine" }
boa_gc = { version = "~0.17.0", path = "boa_gc" }
boa_icu_provider = { version = "~0.17.0", path = "boa_icu_provider" }
boa_interner = { version = "~0.17.0", path = "boa_interner" }
boa_macros = { version = "~0.17.0", path = "boa_macros" }
boa_parser = { version = "~0.17.0", path = "boa_parser" }
boa_profiler = { version = "~0.17.0", path = "boa_profiler" }
boa_runtime = { version = "~0.17.0", path = "boa_runtime" }

# Shared deps
arbitrary = "1"
bitflags = "2.4.0"
chrono = { version = "0.4.31", default-features = false }
clap = "4.4.5"
colored = "2.0.4"
fast-float = "0.2.0"
hashbrown = { version = "0.14.0", default-features = false }
indexmap = "2.0.0"
indoc = "2.0.4"
jemallocator = "0.5.4"
num-bigint = "0.4.4"
num-traits = "0.2.16"
once_cell = { version = "1.18.0", default-features = false }
phf = { version = "0.11.2", default-features = false }
pollster = "0.3.0"
regex = "1.9.5"
regress = "0.7.1"
rustc-hash = { version = "1.1.0", default-features = false }
serde_json = "1.0.107"
serde = "1.0.188"
static_assertions = "1.1.0"
textwrap = "0.16.0"
thin-vec = "0.2.12"

# ICU4X

icu_provider = { version = "~1.3.0", default-features = false }
icu_locid = { version = "~1.3.0", default-features = false }
icu_locid_transform = { version = "~1.3.0", default-features = false }
icu_datetime = { version = "~1.3.0", default-features = false }
icu_calendar = { version = "~1.3.0", default-features = false }
icu_collator = { version = "~1.3.0", default-features = false }
icu_plurals = { version = "~1.3.0", default-features = false }
icu_list = { version = "~1.3.0", default-features = false }
icu_casemap = { version = "~1.3.0", default-features = false }
icu_segmenter = { version = "~1.3.0", default-features = false }
icu_datagen = { version = "~1.3.0", default-features = false }
icu_provider_adapters = { version = "~1.3.0", default-features = false }
icu_provider_blob = { version = "~1.3.0", default-features = false }
icu_properties = { version = "~1.3.0", default-features = false }
writeable = "~0.5.3"
yoke = "~0.7.2"
zerofrom = "~0.1.3"
fixed_decimal = "~0.5.4"

[workspace.metadata.workspaces]
allow_branch = "main"
Expand Down
12 changes: 6 additions & 6 deletions boa_ast/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@ arbitrary = ["dep:arbitrary", "boa_interner/arbitrary", "num-bigint/arbitrary"]
[dependencies]
boa_interner.workspace = true
boa_macros.workspace = true
rustc-hash = "1.1.0"
bitflags = "2.4.0"
num-bigint = "0.4.4"
serde = { version = "1.0.188", features = ["derive"], optional = true }
arbitrary = { version = "1", features = ["derive"], optional = true }
indexmap = "2.0.0"
rustc-hash = { workspace = true, features = ["std"] }
bitflags.workspace = true
num-bigint.workspace = true
serde = { workspace = true, features = ["derive"], optional = true }
arbitrary = { workspace = true, features = ["derive"], optional = true }
indexmap.workspace = true
14 changes: 7 additions & 7 deletions boa_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,18 @@ boa_gc.workspace = true
boa_interner.workspace = true
boa_runtime.workspace = true
rustyline = { version = "12.0.0", features = ["derive"]}
clap = { version = "4.4.5", features = ["derive"] }
serde_json = "1.0.107"
colored = "2.0.4"
regex = "1.9.5"
phf = { version = "0.11.2", features = ["macros"] }
pollster = "0.3.0"
clap = { workspace = true, features = ["derive"] }
serde_json.workspace = true
colored.workspace = true
regex.workspace = true
phf = { workspace = true, features = ["macros"] }
pollster.workspace = true

[features]
default = ["boa_engine/annex-b", "boa_engine/intl"]

[target.x86_64-unknown-linux-gnu.dependencies]
jemallocator = "0.5.4"
jemallocator.workspace = true

[[bin]]
name = "boa"
Expand Down
60 changes: 30 additions & 30 deletions boa_engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -53,54 +53,54 @@ boa_profiler.workspace = true
boa_macros.workspace = true
boa_ast.workspace = true
boa_parser.workspace = true
serde = { version = "1.0.188", features = ["derive", "rc"] }
serde_json = "1.0.107"
serde = { workspace = true, features = ["derive", "rc"] }
serde_json.workspace = true
rand = "0.8.5"
num-traits = "0.2.16"
regress = "0.7.1"
rustc-hash = "1.1.0"
num-bigint = { version = "0.4.4", features = ["serde"] }
num-traits.workspace = true
regress.workspace = true
rustc-hash = { workspace = true, features = ["std"] }
num-bigint = { workspace = true, features = ["serde"] }
num-integer = "0.1.45"
bitflags = "2.4.0"
indexmap = "2.0.0"
bitflags.workspace = true
indexmap.workspace = true
ryu-js = "0.2.2"
chrono = { version = "0.4.31", default-features = false, features = ["clock", "std"] }
fast-float = "0.2.0"
once_cell = "1.18.0"
chrono = { workspace = true, default-features = false, features = ["clock", "std"] }
fast-float.workspace = true
once_cell = { workspace = true, features = ["std"] }
tap = "1.0.1"
sptr = "0.3.2"
static_assertions = "1.1.0"
static_assertions.workspace = true
thiserror = "1.0.48"
dashmap = "5.5.3"
num_enum = "0.7.0"
pollster = "0.3.0"
thin-vec = "0.2.12"
pollster.workspace = true
thin-vec.workspace = true
itertools = { version = "0.11.0", default-features = false }
icu_normalizer = "~1.3.0"

# intl deps
boa_icu_provider = {workspace = true, features = ["std"], optional = true }
sys-locale = { version = "0.3.1", optional = true }
icu_provider = { version = "~1.3.0", optional = true }
icu_locid = { version = "~1.3.0", features = ["serde"], optional = true }
icu_locid_transform = { version = "~1.3.0", default-features = false, features = ["std", "serde"], optional = true }
icu_datetime = { version = "~1.3.0", default-features = false, features = ["serde", "experimental"], optional = true }
icu_calendar = { version = "~1.3.0", default-features = false, optional = true }
icu_collator = { version = "~1.3.0", default-features = false, features = ["serde"], optional = true }
icu_plurals = { version = "~1.3.0", default-features = false, features = ["serde"], optional = true }
icu_list = { version = "~1.3.0", default-features = false, features = ["serde"], optional = true }
icu_casemap = { version = "~1.3.0", default-features = false, features = ["serde"], optional = true}
icu_segmenter = { version = "~1.3.0", default-features = false, features = ["auto", "serde"], optional = true }
writeable = { version = "~0.5.3", optional = true }
yoke = { version = "~0.7.2", optional = true }
zerofrom = { version = "~0.1.3", optional = true }
fixed_decimal = { version = "~0.5.4", features = ["ryu"], optional = true}
icu_provider = { workspace = true, optional = true }
icu_locid = { workspace = true, features = ["serde"], optional = true }
icu_locid_transform = { workspace = true, default-features = false, features = ["std", "serde"], optional = true }
icu_datetime = { workspace = true, default-features = false, features = ["serde", "experimental"], optional = true }
icu_calendar = { workspace = true, default-features = false, optional = true }
icu_collator = { workspace = true, default-features = false, features = ["serde"], optional = true }
icu_plurals = { workspace = true, default-features = false, features = ["serde"], optional = true }
icu_list = { workspace = true, default-features = false, features = ["serde"], optional = true }
icu_casemap = { workspace = true, default-features = false, features = ["serde"], optional = true}
icu_segmenter = { workspace = true, default-features = false, features = ["auto", "serde"], optional = true }
writeable = { workspace = true, optional = true }
yoke = { workspace = true, optional = true }
zerofrom = { workspace = true, optional = true }
fixed_decimal = { workspace = true, features = ["ryu"], optional = true}

[dev-dependencies]
criterion = "0.5.1"
float-cmp = "0.9.0"
indoc = "2.0.4"
textwrap = "0.16.0"
indoc.workspace = true
textwrap.workspace = true
futures-lite = "1.13.0"

[target.x86_64-unknown-linux-gnu.dev-dependencies]
Expand Down
4 changes: 2 additions & 2 deletions boa_gc/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ thinvec = ["thin-vec"]
boa_profiler.workspace = true
boa_macros.workspace = true

thin-vec = { version = "0.2.12", optional = true }
hashbrown = { version = "0.14.0", features = ["raw"] }
thin-vec = { workspace = true, optional = true }
hashbrown = { workspace = true, features = ["ahash", "raw"] }
10 changes: 5 additions & 5 deletions boa_icu_provider/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ rust-version.workspace = true
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
icu_provider = { version = "~1.3.0", features = ["serde", "sync"] }
icu_provider_blob = { version = "~1.3.0" }
icu_provider_adapters = { version = "~1.3.0", features = ["serde"] }
once_cell = { version = "1.18.0", default-features = false, features = ["critical-section"] }
icu_provider = { workspace = true, features = ["serde", "sync"] }
icu_provider_blob = { workspace = true, features = ["export"] }
icu_provider_adapters = { workspace = true, features = ["serde"] }
once_cell = { workspace = true, default-features = false, features = ["critical-section"] }

icu_datagen = { version = "~1.3.0", optional = true }
icu_datagen = { workspace = true, optional = true, features = ["networking"] }
log = { version = "0.4.20", optional = true }
simple_logger = { version = "4.2.0", optional = true }

Expand Down
16 changes: 8 additions & 8 deletions boa_interner/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ std = ["once_cell/std"]
[dependencies]
boa_macros.workspace = true
boa_gc.workspace = true
phf = { version = "0.11.2", default-features = false, features = ["macros"] }
rustc-hash = { version = "1.1.0", default-features = false }
static_assertions = "1.1.0"
once_cell = {version = "1.18.0", default-features = false, features = ["critical-section"]}
indexmap = "2.0.0"
serde = { version = "1.0.188", features = ["derive"], optional = true }
arbitrary = { version = "1", features = ["derive"], optional = true }
hashbrown = { version = "0.14.0", default-features = false, features = ["inline-more"] }
phf = { workspace = true, default-features = false, features = ["macros"] }
rustc-hash = { workspace = true, default-features = false }
static_assertions.workspace = true
once_cell = { workspace = true, default-features = false, features = ["critical-section"]}
indexmap.workspace = true
serde = { workspace = true, features = ["derive"], optional = true }
arbitrary = { workspace = true, features = ["derive"], optional = true }
hashbrown = { workspace = true, default-features = false, features = ["inline-more"] }
14 changes: 7 additions & 7 deletions boa_parser/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@ boa_interner.workspace = true
boa_macros.workspace = true
boa_ast.workspace = true
boa_profiler.workspace = true
rustc-hash = "1.1.0"
fast-float = "0.2.0"
num-traits = "0.2.16"
bitflags = "2.4.0"
num-bigint = "0.4.4"
regress = "0.7.1"
icu_properties = "~1.3.0"
rustc-hash = { workspace = true, features = ["std"] }
fast-float.workspace = true
num-traits.workspace = true
bitflags.workspace = true
num-bigint.workspace = true
regress.workspace = true
icu_properties.workspace = true

[features]
annex-b = []
6 changes: 3 additions & 3 deletions boa_profiler/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ repository.workspace = true
rust-version.workspace = true

[features]
profiler = ["measureme", "once_cell", "rustc-hash"]
profiler = ["dep:measureme", "dep:once_cell", "dep:rustc-hash"]

[dependencies]
measureme = { version = "10.1.1", optional = true }
once_cell = { version = "1.18.0", optional = true }
rustc-hash = { version = "1.1.0", optional = true }
once_cell = { workspace = true, optional = true, features = ["std"] }
rustc-hash = { workspace = true, optional = true }
7 changes: 3 additions & 4 deletions boa_runtime/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@ license.workspace = true
repository.workspace = true
rust-version.workspace = true


[dependencies]
boa_engine.workspace = true
boa_gc.workspace = true
rustc-hash = "1.1.0"
rustc-hash = { workspace = true, features = ["std"] }

[dev-dependencies]
indoc = "2.0.4"
textwrap = "0.16.0"
indoc.workspace = true
textwrap.workspace = true
18 changes: 9 additions & 9 deletions boa_tester/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@ rust-version.workspace = true
[dependencies]
boa_engine.workspace = true
boa_gc.workspace = true
clap = { version = "4.4.5", features = ["derive"] }
serde = { version = "1.0.188", features = ["derive"] }
clap = { workspace = true, features = ["derive"] }
serde = { workspace = true, features = ["derive"] }
serde_yaml = "0.9.25"
serde_json = "1.0.107"
bitflags = "2.4.0"
regex = "1.9.5"
once_cell = "1.18.0"
colored = "2.0.4"
fxhash = "0.2.1"
serde_json.workspace = true
bitflags.workspace = true
regex.workspace = true
once_cell.workspace = true
colored.workspace = true
rustc-hash = { workspace = true, features = ["std"] }
rayon = "1.8.0"
toml = "0.8.0"
color-eyre = "0.6.2"
phf = { version = "0.11.2", features = ["macros"] }
phf = { workspace = true, features = ["macros"] }
comfy-table = "7.0.1"
serde_repr = "0.1.16"

Expand Down
2 changes: 1 addition & 1 deletion boa_tester/src/exec/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ use boa_engine::{
Context, JsArgs, JsError, JsNativeErrorKind, JsValue, Source,
};
use colored::Colorize;
use fxhash::FxHashSet;
use rayon::prelude::*;
use rustc_hash::FxHashSet;
use std::{cell::RefCell, eprintln, rc::Rc};

impl TestSuite {
Expand Down
2 changes: 1 addition & 1 deletion boa_tester/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ use color_eyre::{
};
use colored::Colorize;
use edition::SpecEdition;
use fxhash::{FxHashMap, FxHashSet};
use read::ErrorType;
use rustc_hash::{FxHashMap, FxHashSet};
use serde::{
de::{Unexpected, Visitor},
Deserialize, Deserializer, Serialize,
Expand Down
2 changes: 1 addition & 1 deletion boa_tester/src/read.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use color_eyre::{
eyre::{eyre, WrapErr},
Result,
};
use fxhash::FxHashMap;
use rustc_hash::FxHashMap;
use serde::Deserialize;
use std::{
fs, io,
Expand Down
2 changes: 1 addition & 1 deletion boa_tester/src/results.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ use crate::{Statistics, VersionedStats};

use super::SuiteResult;
use color_eyre::{eyre::WrapErr, Result};
use fxhash::FxHashSet;
use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize};
use std::{
env, fs,
Expand Down
2 changes: 1 addition & 1 deletion boa_wasm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ rust-version.workspace = true
boa_engine.workspace = true
wasm-bindgen = "0.2.87"
getrandom = { version = "0.2.10", features = ["js"] }
chrono = { version = "0.4.31", default-features = false, features = ["clock", "std", "wasmbind"] }
chrono = { workspace = true, default-features = false, features = ["clock", "std", "wasmbind"] }
console_error_panic_hook = "0.1.7"

[features]
Expand Down

0 comments on commit 940e603

Please sign in to comment.