Skip to content

Commit

Permalink
Merge branch 'main' into upgrade_clap
Browse files Browse the repository at this point in the history
  • Loading branch information
jedel1043 authored Oct 15, 2022
2 parents 59c46c1 + c645f85 commit 19e58c8
Show file tree
Hide file tree
Showing 106 changed files with 4,664 additions and 3,462 deletions.
158 changes: 128 additions & 30 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ members = [
"boa_unicode",
"boa_wasm",
"boa_examples",
"boa_macros",
]

[workspace.package]
Expand All @@ -26,6 +27,7 @@ boa_interner = { version = "0.16.0", path = "boa_interner" }
boa_gc = { version = "0.16.0", path = "boa_gc" }
boa_profiler = { version = "0.16.0", path = "boa_profiler" }
boa_unicode = { version = "0.16.0", path = "boa_unicode" }
boa_macros = { version = "0.16.0", path = "boa_macros" }

[workspace.metadata.workspaces]
allow_branch = "main"
Expand Down
2 changes: 1 addition & 1 deletion boa_cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ boa_interner.workspace = true
rustyline = "10.0.0"
rustyline-derive = "0.7.0"
clap = { version = "4.0.12", features = ["derive"] }
serde_json = "1.0.85"
serde_json = "1.0.86"
colored = "2.0.0"
regex = "1.6.0"
phf = { version = "0.11.1", features = ["macros"] }
Expand Down
5 changes: 4 additions & 1 deletion boa_engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,10 @@ boa_unicode.workspace = true
boa_interner.workspace = true
boa_gc.workspace = true
boa_profiler.workspace = true
boa_macros.workspace = true
gc = "0.4.1"
serde = { version = "1.0.145", features = ["derive", "rc"] }
serde_json = "1.0.85"
serde_json = "1.0.86"
rand = "0.8.5"
num-traits = "0.2.15"
regress = "0.4.1"
Expand All @@ -50,6 +51,8 @@ unicode-normalization = "0.1.22"
dyn-clone = "1.0.9"
once_cell = "1.15.0"
tap = "1.0.1"
sptr = "0.3.2"
static_assertions = "1.1.0"
icu_locale_canonicalizer = { version = "0.6.0", features = ["serde"], optional = true }
icu_locid = { version = "0.6.0", features = ["serde"], optional = true }
icu_datetime = { version = "0.6.0", features = ["serde"], optional = true }
Expand Down
Loading

0 comments on commit 19e58c8

Please sign in to comment.