From ed4dad286549800613147e7f1098b3ca5ce63a44 Mon Sep 17 00:00:00 2001
From: Chris Sellers <chris@cjdsellers.io>
Date: Tue, 8 Oct 2024 05:35:13 +1100
Subject: [PATCH] Reorganize and update dependencies

---
 nautilus_core/Cargo.lock                 | 174 +++++++----------------
 nautilus_core/Cargo.toml                 |   7 +-
 nautilus_core/common/Cargo.toml          |   4 +-
 nautilus_trader/core/includes/backtest.h |   2 +-
 nautilus_trader/core/includes/common.h   |   2 +-
 nautilus_trader/core/includes/core.h     |   2 +-
 nautilus_trader/core/includes/model.h    |   2 +-
 7 files changed, 65 insertions(+), 128 deletions(-)

diff --git a/nautilus_core/Cargo.lock b/nautilus_core/Cargo.lock
index 4bbbca72591..964d0135510 100644
--- a/nautilus_core/Cargo.lock
+++ b/nautilus_core/Cargo.lock
@@ -305,7 +305,7 @@ dependencies = [
  "arrow-schema",
  "chrono",
  "half",
- "indexmap 2.6.0",
+ "indexmap",
  "lexical-core",
  "num",
  "serde",
@@ -447,17 +447,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "autocfg"
 version = "1.4.0"
@@ -779,19 +768,19 @@ checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
 
 [[package]]
 name = "cbindgen"
-version = "0.26.0"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da6bc11b07529f16944307272d5bd9b22530bc7d05751717c9d416586cedab49"
+checksum = "3fce8dd7fcfcbf3a0a87d8f515194b49d6135acab73e18bd380d1d93bb1a15eb"
 dependencies = [
- "clap 3.2.25",
+ "clap",
  "heck 0.4.1",
- "indexmap 1.9.3",
+ "indexmap",
  "log",
  "proc-macro2",
  "quote",
  "serde",
  "serde_json",
- "syn 1.0.109",
+ "syn 2.0.79",
  "tempfile",
  "toml",
 ]
@@ -902,21 +891,6 @@ dependencies = [
  "libloading",
 ]
 
-[[package]]
-name = "clap"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
-dependencies = [
- "atty",
- "bitflags 1.3.2",
- "clap_lex 0.2.4",
- "indexmap 1.9.3",
- "strsim 0.10.0",
- "termcolor",
- "textwrap",
-]
-
 [[package]]
 name = "clap"
 version = "4.5.19"
@@ -935,8 +909,8 @@ checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.7.2",
- "strsim 0.11.1",
+ "clap_lex",
+ "strsim",
 ]
 
 [[package]]
@@ -951,15 +925,6 @@ dependencies = [
  "syn 2.0.79",
 ]
 
-[[package]]
-name = "clap_lex"
-version = "0.2.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5"
-dependencies = [
- "os_str_bytes",
-]
-
 [[package]]
 name = "clap_lex"
 version = "0.7.2"
@@ -1115,7 +1080,7 @@ dependencies = [
  "anes",
  "cast",
  "ciborium",
- "clap 4.5.19",
+ "clap",
  "criterion-plot",
  "is-terminal",
  "itertools 0.10.5",
@@ -1233,7 +1198,7 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.11.1",
+ "strsim",
  "syn 2.0.79",
 ]
 
@@ -1324,7 +1289,7 @@ dependencies = [
  "glob",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.6.0",
+ "indexmap",
  "itertools 0.12.1",
  "log",
  "num_cpus",
@@ -1484,7 +1449,7 @@ dependencies = [
  "datafusion-expr",
  "datafusion-physical-expr",
  "hashbrown 0.14.5",
- "indexmap 2.6.0",
+ "indexmap",
  "itertools 0.12.1",
  "log",
  "paste",
@@ -1513,7 +1478,7 @@ dependencies = [
  "half",
  "hashbrown 0.14.5",
  "hex",
- "indexmap 2.6.0",
+ "indexmap",
  "itertools 0.12.1",
  "log",
  "paste",
@@ -1571,7 +1536,7 @@ dependencies = [
  "futures",
  "half",
  "hashbrown 0.14.5",
- "indexmap 2.6.0",
+ "indexmap",
  "itertools 0.12.1",
  "log",
  "once_cell",
@@ -1836,9 +1801,9 @@ dependencies = [
 
 [[package]]
 name = "float-cmp"
-version = "0.9.0"
+version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
+checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8"
 dependencies = [
  "num-traits",
 ]
@@ -2047,7 +2012,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http",
- "indexmap 2.6.0",
+ "indexmap",
  "slab",
  "tokio",
  "tokio-util",
@@ -2111,15 +2076,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -2341,16 +2297,6 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1d39bd655c296413f6c62bdcad319927348d81a83242dc514f7a2d1cfd52faf1"
 
-[[package]]
-name = "indexmap"
-version = "1.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
-dependencies = [
- "autocfg",
- "hashbrown 0.12.3",
-]
-
 [[package]]
 name = "indexmap"
 version = "2.6.0"
@@ -2735,7 +2681,7 @@ dependencies = [
  "databento",
  "fallible-streaming-iterator",
  "hex",
- "indexmap 2.6.0",
+ "indexmap",
  "itoa",
  "nautilus-common",
  "nautilus-core",
@@ -2765,7 +2711,7 @@ dependencies = [
  "anyhow",
  "chrono",
  "criterion",
- "indexmap 2.6.0",
+ "indexmap",
  "nautilus-common",
  "nautilus-core",
  "nautilus-model",
@@ -2805,7 +2751,7 @@ name = "nautilus-cli"
 version = "0.34.0"
 dependencies = [
  "anyhow",
- "clap 4.5.19",
+ "clap",
  "clap_derive",
  "dotenvy",
  "log",
@@ -2825,7 +2771,7 @@ dependencies = [
  "bytes",
  "cbindgen",
  "chrono",
- "indexmap 2.6.0",
+ "indexmap",
  "itertools 0.12.1",
  "log",
  "nautilus-core",
@@ -2859,7 +2805,7 @@ dependencies = [
  "criterion",
  "heck 0.5.0",
  "iai",
- "indexmap 2.6.0",
+ "indexmap",
  "pretty_assertions",
  "pyo3",
  "rmp-serde",
@@ -2878,7 +2824,7 @@ dependencies = [
  "chrono",
  "criterion",
  "derive_builder",
- "indexmap 2.6.0",
+ "indexmap",
  "log",
  "nautilus-common",
  "nautilus-core",
@@ -2903,7 +2849,7 @@ dependencies = [
  "anyhow",
  "criterion",
  "derive_builder",
- "indexmap 2.6.0",
+ "indexmap",
  "log",
  "nautilus-common",
  "nautilus-core",
@@ -2975,7 +2921,7 @@ dependencies = [
  "float-cmp",
  "iai",
  "implied-vol",
- "indexmap 2.6.0",
+ "indexmap",
  "nautilus-adapters",
  "nautilus-core",
  "nautilus-test-kit",
@@ -3349,12 +3295,6 @@ dependencies = [
  "num-traits",
 ]
 
-[[package]]
-name = "os_str_bytes"
-version = "6.6.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
-
 [[package]]
 name = "overload"
 version = "0.1.1"
@@ -3484,7 +3424,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.6.0",
+ "indexmap",
 ]
 
 [[package]]
@@ -3688,9 +3628,9 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.86"
+version = "1.0.87"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
+checksum = "b3e4daa0dcf6feba26f985457cdf104d4b4256fc5a09547140f3631bb076b19a"
 dependencies = [
  "unicode-ident",
 ]
@@ -4186,9 +4126,9 @@ dependencies = [
 
 [[package]]
 name = "rstest"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9afd55a67069d6e434a95161415f5beeada95a01c7b815508a82dcb0e1593682"
+checksum = "0a2c585be59b6b5dd66a9d2084aa1d8bd52fbdb806eafdeffb52791147862035"
 dependencies = [
  "futures",
  "futures-timer",
@@ -4198,9 +4138,9 @@ dependencies = [
 
 [[package]]
 name = "rstest_macros"
-version = "0.21.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4165dfae59a39dd41d8dec720d3cbfbc71f69744efb480a3920f5d4e0cc6798d"
+checksum = "825ea780781b15345a146be27eaefb05085e337e869bff01b4306a4fd4a9ad5a"
 dependencies = [
  "cfg-if",
  "glob",
@@ -4474,6 +4414,15 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serde_spanned"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_urlencoded"
 version = "0.7.1"
@@ -4712,7 +4661,7 @@ dependencies = [
  "hashbrown 0.14.5",
  "hashlink",
  "hex",
- "indexmap 2.6.0",
+ "indexmap",
  "log",
  "memchr",
  "once_cell",
@@ -4889,12 +4838,6 @@ dependencies = [
  "unicode-properties",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -4980,9 +4923,9 @@ dependencies = [
 
 [[package]]
 name = "sysinfo"
-version = "0.31.4"
+version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
+checksum = "e3b5ae3f4f7d64646c46c4cae4e3f01d1c5d255c7406fdd7c7f999a94e488791"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -5061,21 +5004,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "termcolor"
-version = "1.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755"
-dependencies = [
- "winapi-util",
-]
-
-[[package]]
-name = "textwrap"
-version = "0.16.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23d434d3f8967a09480fb04132ebe0a3e088c173e6d0ee7897abbdf4eab0f8b9"
-
 [[package]]
 name = "thiserror"
 version = "1.0.64"
@@ -5293,11 +5221,14 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.5.11"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
+ "serde_spanned",
+ "toml_datetime",
+ "toml_edit",
 ]
 
 [[package]]
@@ -5305,6 +5236,9 @@ name = "toml_datetime"
 version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
+dependencies = [
+ "serde",
+]
 
 [[package]]
 name = "toml_edit"
@@ -5312,7 +5246,9 @@ version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.6.0",
+ "indexmap",
+ "serde",
+ "serde_spanned",
  "toml_datetime",
  "winnow",
 ]
diff --git a/nautilus_core/Cargo.toml b/nautilus_core/Cargo.toml
index 9f9c51f83a5..f00d4d7bcf2 100644
--- a/nautilus_core/Cargo.toml
+++ b/nautilus_core/Cargo.toml
@@ -60,14 +60,15 @@ uuid = { version = "1.10.0", features = ["v4"] }
 # dev-dependencies
 axum = "0.7.7"
 criterion = "0.5.1"
-float-cmp = "0.9.0"
+float-cmp = "0.10.0"
 iai = "0.1.1"
 pretty_assertions = "1.4.1"
-rstest = "0.21.0"
+proptest = "1.5.0"
+rstest = "0.23.0"
 tempfile = "3.13.0"
 
 # build-dependencies
-cbindgen = "0.26.0"
+cbindgen = "0.27.0"
 
 [profile.dev]
 opt-level = 0
diff --git a/nautilus_core/common/Cargo.toml b/nautilus_core/common/Cargo.toml
index 3458b5d9ad5..d24e0e29939 100644
--- a/nautilus_core/common/Cargo.toml
+++ b/nautilus_core/common/Cargo.toml
@@ -33,11 +33,11 @@ tracing-subscriber = { version = "0.3.18", default-features = false, features =
 tracing = { workspace = true }
 ustr = { workspace = true }
 uuid = { workspace = true }
-sysinfo = "0.31.4"
+sysinfo = "0.32.0"
 
 [dev-dependencies]
+proptest = { workspace = true }
 tempfile = { workspace = true }
-proptest = "1.5.0"
 
 [build-dependencies]
 cbindgen = { workspace = true, optional = true }
diff --git a/nautilus_trader/core/includes/backtest.h b/nautilus_trader/core/includes/backtest.h
index 1b5e0a970d0..d91dbab4a1b 100644
--- a/nautilus_trader/core/includes/backtest.h
+++ b/nautilus_trader/core/includes/backtest.h
@@ -1,4 +1,4 @@
-/* Generated with cbindgen:0.26.0 */
+/* Generated with cbindgen:0.27.0 */
 
 /* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
 
diff --git a/nautilus_trader/core/includes/common.h b/nautilus_trader/core/includes/common.h
index e72d2ffa4b1..7295daa8e58 100644
--- a/nautilus_trader/core/includes/common.h
+++ b/nautilus_trader/core/includes/common.h
@@ -1,4 +1,4 @@
-/* Generated with cbindgen:0.26.0 */
+/* Generated with cbindgen:0.27.0 */
 
 /* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
 
diff --git a/nautilus_trader/core/includes/core.h b/nautilus_trader/core/includes/core.h
index f73ee70d51c..f9d5b3fcbca 100644
--- a/nautilus_trader/core/includes/core.h
+++ b/nautilus_trader/core/includes/core.h
@@ -1,4 +1,4 @@
-/* Generated with cbindgen:0.26.0 */
+/* Generated with cbindgen:0.27.0 */
 
 /* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */
 
diff --git a/nautilus_trader/core/includes/model.h b/nautilus_trader/core/includes/model.h
index 9d674922a02..9a635d7ed7e 100644
--- a/nautilus_trader/core/includes/model.h
+++ b/nautilus_trader/core/includes/model.h
@@ -1,4 +1,4 @@
-/* Generated with cbindgen:0.26.0 */
+/* Generated with cbindgen:0.27.0 */
 
 /* Warning, this file is autogenerated by cbindgen. Don't modify this manually. */