Skip to content

Commit

Permalink
Merge f6fd3bb into b0c387b
Browse files Browse the repository at this point in the history
  • Loading branch information
Paul Lancaster authored Aug 27, 2020
2 parents b0c387b + f6fd3bb commit 52dedb1
Show file tree
Hide file tree
Showing 85 changed files with 4,895 additions and 2,572 deletions.
File renamed without changes.
30 changes: 30 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
# Handle line endings automatically for files detected as text
# and leave all files detected as binary untouched.
* text=auto

#
# The above will handle all files NOT found below
#
# These files are text and should be normalized (Convert crlf => lf)
*.css eol=lf
*.htm eol=lf
*.html eol=lf
*.js eol=lf
*.json eol=lf
*.sh eol=lf
*.txt eol=lf
*.yml eol=lf
*.rs eol=lf
*.toml eol=lf
*.lock eol=lf
*.md eol=lf
*.svg eol=lf

# These files are binary and should be left untouched
# (binary is a macro for -text -diff)
*.gif binary
*.ico binary
*.jar binary
*.jpg binary
*.jpeg binary
*.png binary
109 changes: 48 additions & 61 deletions Cargo.lock

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

4 changes: 1 addition & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -86,9 +86,7 @@ FLAGS:
-V, --version Prints version information
OPTIONS:
-a, --dump-ast <FORMAT> Dump the ast to stdout with the given format [possible values: Debug, Json,
JsonPretty]
-t, --dump-tokens <FORMAT> Dump the token stream to stdout with the given format [possible values: Debug, Json,
-a, --dump-ast <FORMAT> Dump the abstract syntax tree (ast) to stdout with the given format [possible values: Debug, Json,
JsonPretty]
ARGS:
Expand Down
16 changes: 6 additions & 10 deletions boa/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,22 +15,22 @@ profiler = ["measureme", "once_cell"]

[dependencies]
gc = { version = "0.3.6", features = ["derive"] }
serde_json = "1.0.56"
serde_json = "1.0.57"
rand = "0.7.3"
num-traits = "0.2.12"
regex = "1.3.9"
rustc-hash = "1.1.0"
num-bigint = { version = "0.3.0", features = ["serde"] }
num-integer = "0.1.43"
bitflags = "1.2.1"
indexmap = "1.4.0"
indexmap = "1.5.1"
ryu-js = "0.2.0"
chrono = "0.4"
chrono = "0.4.15"

# Optional Dependencies
serde = { version = "1.0.114", features = ["derive"], optional = true }
serde = { version = "1.0.115", features = ["derive"], optional = true }
measureme = { version = "0.7.1", optional = true }
once_cell = { version = "1.4.0", optional = true }
once_cell = { version = "1.4.1", optional = true }

[dev-dependencies]
criterion = "=0.3.2"
Expand All @@ -43,10 +43,6 @@ crate-type = ["cdylib", "lib"]
name = "boa"
bench = false

[[bench]]
name = "lexer"
harness = false

[[bench]]
name = "parser"
harness = false
Expand All @@ -57,4 +53,4 @@ harness = false

[[bench]]
name = "full"
harness = false
harness = false
Loading

0 comments on commit 52dedb1

Please sign in to comment.