* compiles on nightly now. (breaking change)

* less deps

* Switch over to new resolver

(it's been stable for a while.)

* let's leave num-format for another PR
This commit is contained in:
Squirrel 2021-09-27 19:17:00 +01:00 committed by GitHub
parent 32581497ef
commit 4e0d7bc77c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 2 additions and 164 deletions

100
Cargo.lock generated
View File

@ -180,17 +180,6 @@ dependencies = [
"stable_deref_trait",
]
[[package]]
name = "async-recursion"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d7d78656ba01f1b93024b7c3a0467f1608e4be67d725749fdcd7d2c7678fd7a2"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "async-std"
version = "1.10.0"
@ -1458,18 +1447,6 @@ dependencies = [
"tokio-io",
]
[[package]]
name = "futures_codec"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ce54d63f8b0c75023ed920d46fd71d0cbbb830b0ee012726b5b4f506fb6dea5b"
dependencies = [
"bytes 0.5.6",
"futures 0.3.16",
"memchr",
"pin-project",
]
[[package]]
name = "fxhash"
version = "0.2.1"
@ -2567,7 +2544,6 @@ name = "nu-ansi-term"
version = "0.37.1"
dependencies = [
"doc-comment",
"itertools",
"overload",
"regex",
"serde",
@ -2609,26 +2585,20 @@ dependencies = [
"arboard",
"base64",
"bigdecimal-rs",
"byte-unit",
"bytes 1.1.0",
"calamine",
"chrono",
"chrono-tz",
"codespan-reporting",
"crossterm",
"csv",
"ctrlc",
"derive-new",
"digest",
"directories-next",
"dirs-next",
"dtparse",
"eml-parser",
"encoding_rs",
"filesize",
"fs_extra",
"futures 0.3.16",
"getset",
"glob",
"hamcrest2",
"htmlescape",
@ -2661,22 +2631,17 @@ dependencies = [
"num-format",
"num-traits",
"parking_lot",
"pin-utils",
"polars",
"query_interface",
"quick-xml 0.22.0",
"quickcheck",
"quickcheck_macros",
"rand 0.8.4",
"rayon",
"regex",
"reqwest",
"roxmltree",
"rusqlite",
"rust-embed",
"rustyline",
"serde",
"serde_bytes",
"serde_ini",
"serde_json",
"serde_urlencoded",
@ -2684,13 +2649,9 @@ dependencies = [
"sha2",
"shadow-rs",
"strip-ansi-escapes",
"sxd-document",
"sxd-xpath",
"sysinfo",
"tempfile",
"term 0.7.0",
"term_size",
"termcolor",
"thiserror",
"titlecase",
"tokio",
@ -2709,12 +2670,10 @@ dependencies = [
name = "nu-completion"
version = "0.37.1"
dependencies = [
"dirs-next",
"indexmap",
"is_executable",
"nu-data",
"nu-engine",
"nu-errors",
"nu-parser",
"nu-path",
"nu-protocol",
@ -2733,7 +2692,6 @@ dependencies = [
"common-path",
"derive-new",
"directories-next",
"dirs-next",
"getset",
"indexmap",
"log",
@ -2748,7 +2706,6 @@ dependencies = [
"num-bigint 0.3.3",
"num-format",
"num-traits",
"query_interface",
"serde",
"sha2",
"sys-locale",
@ -2761,21 +2718,15 @@ name = "nu-engine"
version = "0.37.1"
dependencies = [
"ansi_term 0.12.1",
"async-recursion",
"async-trait",
"bigdecimal-rs",
"bytes 0.5.6",
"chrono",
"codespan-reporting",
"derive-new",
"dirs-next",
"dyn-clone",
"encoding_rs",
"filesize",
"fs_extra",
"futures 0.3.16",
"futures-util",
"futures_codec",
"getset",
"glob",
"hamcrest2",
@ -2795,8 +2746,6 @@ dependencies = [
"nu-test-support",
"nu-value-ext",
"num-bigint 0.3.3",
"num-format",
"num-traits",
"parking_lot",
"rayon",
"serde",
@ -2848,7 +2797,6 @@ name = "nu-parser"
version = "0.37.1"
dependencies = [
"bigdecimal-rs",
"codespan-reporting",
"derive-new",
"indexmap",
"itertools",
@ -2860,8 +2808,6 @@ dependencies = [
"nu-source",
"nu-test-support",
"num-bigint 0.3.3",
"num-traits",
"serde",
"smart-default",
]
@ -2877,14 +2823,12 @@ dependencies = [
name = "nu-plugin"
version = "0.37.1"
dependencies = [
"bigdecimal-rs",
"indexmap",
"nu-errors",
"nu-protocol",
"nu-source",
"nu-test-support",
"nu-value-ext",
"num-bigint 0.3.3",
"serde",
"serde_json",
]
@ -2918,9 +2862,6 @@ dependencies = [
"polars",
"serde",
"serde_bytes",
"serde_json",
"serde_yaml",
"toml",
]
[[package]]
@ -2950,7 +2891,6 @@ dependencies = [
name = "nu-stream"
version = "0.37.1"
dependencies = [
"futures 0.3.16",
"nu-errors",
"nu-protocol",
"nu-source",
@ -2971,7 +2911,6 @@ version = "0.37.1"
dependencies = [
"bigdecimal-rs",
"chrono",
"dunce",
"getset",
"glob",
"hamcrest2",
@ -2980,7 +2919,6 @@ dependencies = [
"nu-path",
"nu-protocol",
"nu-source",
"nu-value-ext",
"num-bigint 0.3.3",
"tempfile",
]
@ -3037,8 +2975,6 @@ dependencies = [
"nu-plugin",
"nu-protocol",
"nu-source",
"nu-value-ext",
"num-traits",
]
[[package]]
@ -3062,8 +2998,6 @@ dependencies = [
"nu-plugin",
"nu-protocol",
"nu-source",
"nu-value-ext",
"num-traits",
"rusqlite",
"tempfile",
]
@ -3088,7 +3022,6 @@ dependencies = [
"nu-errors",
"nu-plugin",
"nu-protocol",
"nu-source",
"regex",
]
@ -3101,7 +3034,6 @@ dependencies = [
"nu-plugin",
"nu-protocol",
"nu-source",
"nu-test-support",
]
[[package]]
@ -3126,7 +3058,6 @@ dependencies = [
"nu-plugin",
"nu-protocol",
"nu-source",
"nu-test-support",
"scraper",
]
@ -3149,7 +3080,6 @@ name = "nu_plugin_textview"
version = "0.37.1"
dependencies = [
"bat",
"nu-ansi-term",
"nu-data",
"nu-errors",
"nu-plugin",
@ -3168,7 +3098,6 @@ dependencies = [
"nu-plugin",
"nu-protocol",
"nu-source",
"nu-value-ext",
"num-traits",
]
@ -3181,8 +3110,6 @@ dependencies = [
"nu-plugin",
"nu-protocol",
"nu-source",
"nu-value-ext",
"num-traits",
"rusqlite",
"tempfile",
]
@ -3195,7 +3122,6 @@ dependencies = [
"nu-errors",
"nu-plugin",
"nu-protocol",
"nu-source",
"ptree",
]
@ -3669,26 +3595,6 @@ dependencies = [
"siphasher",
]
[[package]]
name = "pin-project"
version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "918192b5c59119d51e0cd221f4d49dde9112824ba717369e903c97d076083d0f"
dependencies = [
"pin-project-internal",
]
[[package]]
name = "pin-project-internal"
version = "0.4.28"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3be26700300be6d9d23264c73211d8190e755b6b5ca7a1b28230025511b52a5e"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "pin-project-lite"
version = "0.2.7"
@ -3929,12 +3835,6 @@ dependencies = [
"serde",
]
[[package]]
name = "query_interface"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "78c0f0046284eebb86b68f93f9677d499034f88e15ca01021ceea32c4d3c3693"
[[package]]
name = "quick-error"
version = "1.2.3"

View File

@ -21,7 +21,6 @@ derive_serde_style = ["serde"]
[dependencies]
overload = "0.1.1"
serde = { version="1.0.90", features=["derive"], optional=true }
itertools = "0.10.0"
# [dependencies.serde]
# version = "1.0.90"

View File

@ -34,25 +34,19 @@ Inflector = "0.11"
arboard = { version="1.1.0", optional=true }
base64 = "0.13.0"
bigdecimal = { package = "bigdecimal-rs", version = "0.2.1", features = ["serde"] }
byte-unit = "4.0.9"
bytes = "1.0.1"
calamine = "0.18.0"
chrono = { version="0.4.19", features=["serde"] }
chrono-tz = "0.5.3"
codespan-reporting = "0.11.0"
crossterm = { version="0.19.0", optional=true }
csv = "1.1.3"
ctrlc = { version="3.1.7", optional=true }
derive-new = "0.5.8"
directories-next = "2.0.0"
dirs-next = "2.0.0"
dtparse = "1.2.0"
eml-parser = "0.1.0"
encoding_rs = "0.8.28"
filesize = "0.2.0"
fs_extra = "1.2.0"
futures = { version="0.3.12", features=["compat", "io-compat"] }
getset = "0.1.1"
glob = "0.3.0"
htmlescape = "0.3.1"
ical = "0.7.0"
@ -67,32 +61,24 @@ num-bigint = { version="0.3.1", features=["serde"] }
num-format = { version="0.4.0", features=["with-num-bigint"] }
num-traits = "0.2.14"
parking_lot = "0.11.1"
pin-utils = "0.1.0"
query_interface = "0.3.5"
quick-xml = "0.22"
rand = "0.8"
rayon = "1.5.0"
regex = "1.4.3"
reqwest = {version = "0.11", optional = true }
roxmltree = "0.14.0"
rust-embed = "5.9.0"
rustyline = { version="9.0.0", optional=true }
serde = { version="1.0.123", features=["derive"] }
serde_bytes = "0.11.5"
serde_ini = "0.2.0"
serde_json = "1.0.61"
serde_urlencoded = "0.7.0"
serde_yaml = "0.8.16"
sha2 = "0.9.3"
strip-ansi-escapes = "0.1.0"
sxd-document = "0.3.2"
sxd-xpath = "0.4.2"
sysinfo = { version = "0.20.2", optional = true }
thiserror = "1.0.26"
tempfile = "3.2.0"
term = { version="0.7.0", optional=true }
term_size = "0.3.2"
termcolor = "1.1.2"
titlecase = "1.1.0"
tokio = { version = "1", features = ["rt-multi-thread"], optional = true }
toml = "0.5.8"
@ -115,13 +101,8 @@ users = "0.11.0"
# TODO this will be possible with new dependency resolver
# (currently on nightly behind -Zfeatures=itarget):
# https://github.com/rust-lang/cargo/issues/7914
#[target.'cfg(not(windows))'.dependencies]
#num-format = {version = "0.4", features = ["with-system-locale"]}
[dependencies.rusqlite]
features = ["bundled", "blob"]
optional = true
version = "0.25.3"
# [target.'cfg(not(windows))'.dependencies]
# num-format = { version = "0.4", features = ["with-system-locale"] }
[build-dependencies]
shadow-rs = "0.6"

View File

@ -12,14 +12,11 @@ doctest = false
[dependencies]
nu-engine = { version = "0.37.1", path="../nu-engine" }
nu-data = { version = "0.37.1", path="../nu-data" }
nu-errors = { version = "0.37.1", path="../nu-errors" }
nu-parser = { version = "0.37.1", path="../nu-parser" }
nu-path = { version = "0.37.1", path="../nu-path" }
nu-protocol = { version = "0.37.1", path="../nu-protocol" }
nu-source = { version = "0.37.1", path="../nu-source" }
nu-test-support = { version = "0.37.1", path="../nu-test-support" }
dirs-next = "2.0.0"
indexmap = { version="1.6.1", features=["serde-1"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]

View File

@ -16,14 +16,12 @@ chrono = "0.4.19"
common-path = "1.0.0"
derive-new = "0.5.8"
directories-next = "2.0.0"
dirs-next = "2.0.0"
getset = "0.1.1"
indexmap = { version="1.6.1", features=["serde-1"] }
log = "0.4.14"
num-bigint = { version="0.3.1", features=["serde"] }
num-format = "0.4.0"
num-traits = "0.2.14"
query_interface = "0.3.5"
serde = { version="1.0.123", features=["derive"] }
sha2 = "0.9.3"
sys-locale = "0.1.0"

View File

@ -22,10 +22,7 @@ nu-path = { version = "0.37.1", path="../nu-path" }
trash = { version="1.3.0", optional=true }
which = { version="4.0.2", optional=true }
codespan-reporting = "0.11.0"
dyn-clone = "1.0.4"
ansi_term = "0.12.1"
async-recursion = "0.3.2"
async-trait = "0.1.42"
bigdecimal = { package = "bigdecimal-rs", version = "0.2.1", features = ["serde"] }
bytes = "0.5.6"
chrono = { version="0.4.19", features=["serde"] }
@ -34,9 +31,6 @@ dirs-next = "2.0.0"
encoding_rs = "0.8.28"
filesize = "0.2.0"
fs_extra = "1.2.0"
futures = { version="0.3.12", features=["compat", "io-compat"] }
futures-util = "0.3.12"
futures_codec = "0.4.1"
getset = "0.1.1"
glob = "0.3.0"
indexmap = { version="1.6.1", features=["serde-1"] }
@ -44,8 +38,6 @@ itertools = "0.10.0"
lazy_static = "1.*"
log = "0.4.14"
num-bigint = { version="0.3.1", features=["serde"] }
num-format = "0.4.0"
num-traits = "0.2.14"
parking_lot = "0.11.1"
rayon = "1.5.0"
serde = { version="1.0.123", features=["derive"] }

View File

@ -8,13 +8,10 @@ version = "0.37.1"
[dependencies]
bigdecimal = { package = "bigdecimal-rs", version = "0.2.1", features = ["serde"] }
codespan-reporting = "0.11.0"
derive-new = "0.5.8"
indexmap = { version="1.6.1", features=["serde-1"] }
log = "0.4"
num-bigint = { version="0.3.1", features=["serde"] }
num-traits = "0.2.14"
serde = "1.0"
itertools = "0.10.0"
smart-default = "0.6.0"

View File

@ -15,10 +15,7 @@ nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-test-support = { path="../nu-test-support", version = "0.37.1" }
nu-value-ext = { path="../nu-value-ext", version = "0.37.1" }
bigdecimal = { package = "bigdecimal-rs", version = "0.2.1", features = ["serde"] }
indexmap = { version="1.6.1", features=["serde-1"] }
num-bigint = { version="0.3.1", features=["serde"] }
serde = { version="1.0", features=["derive"] }
serde_json = "1.0"

View File

@ -26,11 +26,6 @@ num-traits = "0.2.14"
serde = { version="1.0", features=["derive"] }
serde_bytes = "0.11.5"
# implement conversions
serde_json = "1.0"
serde_yaml = "0.8.16"
toml = "0.5.8"
[dependencies.polars]
version = "0.16.0"
optional = true

View File

@ -11,7 +11,5 @@ nu-errors = { version = "0.37.1", path="../nu-errors" }
nu-protocol = { version = "0.37.1", path="../nu-protocol" }
nu-source = { version = "0.37.1", path="../nu-source" }
futures = { version="0.3.12", features=["compat", "io-compat"] }
[features]
stable = []

View File

@ -14,11 +14,9 @@ nu-errors = { version = "0.37.1", path="../nu-errors" }
nu-path = { version = "0.37.1", path="../nu-path" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-value-ext = { version = "0.37.1", path="../nu-value-ext" }
bigdecimal = { package = "bigdecimal-rs", version = "0.2.1", features = ["serde"] }
chrono = "0.4.19"
dunce = "1.0.1"
getset = "0.1.1"
glob = "0.3.0"
indexmap = { version="1.6.1", features=["serde-1"] }

View File

@ -16,7 +16,5 @@ nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-value-ext = { path="../nu-value-ext", version = "0.37.1" }
num-traits = "0.2.14"
[build-dependencies]

View File

@ -15,8 +15,6 @@ nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-value-ext = { path="../nu-value-ext", version = "0.37.1" }
num-traits = "0.2.14"
tempfile = "3.2.0"
[dependencies.rusqlite]

View File

@ -13,7 +13,6 @@ doctest = false
nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
regex = "1.4.3"
[build-dependencies]

View File

@ -15,6 +15,3 @@ nu-errors = { version = "0.37.1", path="../nu-errors" }
nu-plugin = { version = "0.37.1", path="../nu-plugin" }
nu-protocol = { version = "0.37.1", path="../nu-protocol" }
nu-source = { version = "0.37.1", path="../nu-source" }
[dev-dependencies]
nu-test-support = { path="../nu-test-support", version = "0.37.1" }

View File

@ -18,5 +18,4 @@ nu-protocol = { version = "0.37.1", path="../nu-protocol" }
nu-source = { version = "0.37.1", path="../nu-source" }
[dev-dependencies]
nu-test-support = { path="../nu-test-support", version = "0.37.1" }
indexmap = { version="1.7", features=["serde-1"] }

View File

@ -15,7 +15,6 @@ nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-ansi-term = { version = "0.37.1", path="../nu-ansi-term" }
bat = { version="0.18", features=["regex-fancy", "paging", "git"] }
term_size = "0.3.2"

View File

@ -15,7 +15,6 @@ nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-value-ext = { path="../nu-value-ext", version = "0.37.1" }
num-traits = "0.2.14"
[features]

View File

@ -15,8 +15,6 @@ nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
nu-value-ext = { path="../nu-value-ext", version = "0.37.1" }
num-traits = "0.2.14"
tempfile = "3.2.0"
[dependencies.rusqlite]

View File

@ -14,7 +14,6 @@ derive-new = "0.5.8"
nu-errors = { path="../nu-errors", version = "0.37.1" }
nu-plugin = { path="../nu-plugin", version = "0.37.1" }
nu-protocol = { path="../nu-protocol", version = "0.37.1" }
nu-source = { path="../nu-source", version = "0.37.1" }
ptree = { version = "0.3.1", default-features = false }