2022-08-04 15:29:38 +02:00
|
|
|
[package]
|
|
|
|
|
name = "tvix-eval"
|
|
|
|
|
version = "0.1.0"
|
|
|
|
|
edition = "2021"
|
|
|
|
|
|
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
|
|
2022-09-03 18:40:01 +02:00
|
|
|
[lib]
|
|
|
|
|
name = "tvix_eval"
|
|
|
|
|
|
2022-08-04 15:29:38 +02:00
|
|
|
[dependencies]
|
2022-12-29 12:44:09 +01:00
|
|
|
backtrace-on-stack-overflow = { version = "0.2.0", optional = true }
|
|
|
|
|
builtin-macros = { path = "./builtin-macros", package = "tvix-eval-builtin-macros" }
|
2022-09-01 14:52:48 +02:00
|
|
|
codemap = "0.1.3"
|
2022-09-11 23:34:25 +02:00
|
|
|
codemap-diagnostic = "0.1.1"
|
2022-12-29 12:44:09 +01:00
|
|
|
dirs = "4.0.0"
|
2023-02-26 17:00:25 +01:00
|
|
|
genawaiter = "0.99.1"
|
2022-12-24 18:18:26 +01:00
|
|
|
imbl = { version = "2.0", features = [ "serde" ] }
|
feat(tvix/eval): use lexical-core to format float
Apparently our naive implementation of float formatting, which simply
used {:.5}, and trimmed trailing "0" strings not sufficient.
It wrongly trimmed numbers with zeroes but no decimal point, like
`10000` got trimmed to `1`.
Nix uses `std::to_string` on the double, which according to
https://en.cppreference.com/w/cpp/string/basic_string/to_string
is equivalent to `std::sprintf(buf, "%f", value)`.
https://en.cppreference.com/w/cpp/io/c/fprintf mentions this is treated
like this:
> Precision specifies the exact number of digits to appear after
> the decimal point character. The default precision is 6. In the
> alternative implementation decimal point character is written even if
> no digits follow it. For infinity and not-a-number conversion style
> see notes.
This doesn't seem to be the case though, and Nix uses scientific
notation in some cases.
There's a whole bunch of strategies to determine which is a more compact
notation, and which notation should be used for a given number.
https://github.com/rust-lang/rust/issues/24556 provides some pointers
into various rabbit holes for those interested.
This gist seems to be that currently a different formatting is not
exposed in rust directly, at least not for public consumption.
There is the
[lexical-core](https://github.com/Alexhuszagh/rust-lexical) crate
though, which provides a way to format floats with various strategies
and formats.
Change our implementation of `TotalDisplay` for the `Value::Float` case
to use that. We still need to do some post-processing, because Nix
always adds the sign in scientific notation (and there's no way to
configure lexical-core to do that), and lexical-core in some cases keeps
the trailing zeros.
Even with all that in place, there as a difference in `eval-okay-
fromjson.nix` (from tvix-tests), which I couldn't get to work. I updated
the fixture to a less problematic number.
With this, the testsuite passes again, and does for the upcoming CL
introducing builtins.fromTOML, and enabling the nix testsuite bits for
it, too.
Change-Id: Ie6fba5619e1d9fd7ce669a51594658b029057acc
Reviewed-on: https://cl.tvl.fyi/c/depot/+/7922
Tested-by: BuildkiteCI
Autosubmit: flokli <flokli@flokli.de>
Reviewed-by: tazjin <tazjin@tvl.su>
2023-01-24 19:27:20 +01:00
|
|
|
lazy_static = "1.4.0"
|
|
|
|
|
lexical-core = { version = "0.8.5", features = ["format", "parse-floats"] }
|
2022-12-29 12:44:09 +01:00
|
|
|
path-clean = "0.1"
|
2022-09-17 19:52:02 +02:00
|
|
|
proptest = { version = "1.0.0", default_features = false, features = ["std", "alloc", "break-dead-code", "tempfile"], optional = true }
|
2022-10-13 00:45:52 +02:00
|
|
|
regex = "1.6.0"
|
2022-12-06 14:31:09 +01:00
|
|
|
rnix = "0.11.0"
|
2022-12-29 12:44:09 +01:00
|
|
|
rowan = "*" # pinned by rnix
|
2022-12-24 18:18:26 +01:00
|
|
|
serde = { version = "1.0", features = [ "rc", "derive" ] }
|
2022-12-29 12:44:09 +01:00
|
|
|
serde_json = "1.0"
|
|
|
|
|
smol_str = "0.1"
|
|
|
|
|
tabwriter = "1.2"
|
|
|
|
|
test-strategy = { version = "0.2.1", optional = true }
|
2023-01-24 15:54:29 +01:00
|
|
|
toml = "0.6.0"
|
2023-01-15 12:52:37 +01:00
|
|
|
xml-rs = "0.8.4"
|
2022-08-10 17:52:42 +02:00
|
|
|
|
|
|
|
|
[dev-dependencies]
|
2022-12-16 12:54:22 +01:00
|
|
|
criterion = "0.4"
|
2022-08-16 14:33:50 +02:00
|
|
|
pretty_assertions = "1.2.1"
|
2022-09-02 21:02:19 +02:00
|
|
|
itertools = "0.10.3"
|
2022-09-03 17:42:27 +02:00
|
|
|
tempdir = "0.3.7"
|
2022-08-10 18:18:01 +02:00
|
|
|
|
2022-12-18 15:23:35 +01:00
|
|
|
[dev-dependencies.test-generator]
|
|
|
|
|
# This fork of test-generator adds support for cargo workspaces, see
|
|
|
|
|
# also https://github.com/frehberg/test-generator/pull/14
|
|
|
|
|
git = "https://github.com/JamesGuthrie/test-generator.git"
|
|
|
|
|
rev = "82e799979980962aec1aa324ec6e0e4cad781f41"
|
|
|
|
|
|
2022-08-10 18:18:01 +02:00
|
|
|
[features]
|
2023-01-24 15:54:29 +01:00
|
|
|
default = ["impure", "arbitrary", "nix_tests", "backtrace_overflow"]
|
2022-09-03 18:40:01 +02:00
|
|
|
|
2022-08-10 18:18:01 +02:00
|
|
|
# Enables running the Nix language test suite from the original C++
|
|
|
|
|
# Nix implementation (at version 2.3) against Tvix.
|
|
|
|
|
nix_tests = []
|
2022-08-25 17:04:07 +02:00
|
|
|
|
2022-09-18 22:34:41 +02:00
|
|
|
# Enables operations in the VM which depend on the ability to perform I/O
|
|
|
|
|
impure = []
|
|
|
|
|
|
2022-09-17 19:52:02 +02:00
|
|
|
# Enables Arbitrary impls for internal types (required to run tests)
|
2023-01-24 15:54:29 +01:00
|
|
|
arbitrary = ["proptest", "test-strategy", "imbl/proptest"]
|
2022-09-17 19:52:02 +02:00
|
|
|
|
2022-11-23 04:42:06 +01:00
|
|
|
# For debugging use only; not appropriate for production use.
|
2023-01-24 15:54:29 +01:00
|
|
|
backtrace_overflow = ["backtrace-on-stack-overflow"]
|
2022-11-23 04:42:06 +01:00
|
|
|
|
2022-08-25 17:04:07 +02:00
|
|
|
[[bench]]
|
|
|
|
|
name = "eval"
|
|
|
|
|
harness = false
|
