diff --git a/Cargo.lock b/Cargo.lock index 10a9164a9c127abe0b1ad9e1fdb399e470575b62..add99404eea5c4f6324dae6984292d296fa0fe4f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -83,6 +83,16 @@ dependencies = [ "pkg-config", ] +[[package]] +name = "lock_api" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45" +dependencies = [ + "autocfg", + "scopeguard", +] + [[package]] name = "mach2" version = "0.4.2" @@ -165,6 +175,29 @@ dependencies = [ "autocfg", ] +[[package]] +name = "parking_lot" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f" +dependencies = [ + "lock_api", + "parking_lot_core", +] + +[[package]] +name = "parking_lot_core" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e" +dependencies = [ + "cfg-if", + "libc", + "redox_syscall", + "smallvec", + "windows-targets", +] + [[package]] name = "pkg-config" version = "0.3.30" @@ -195,6 +228,15 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "regex" version = "1.10.3" @@ -227,7 +269,7 @@ checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" [[package]] name = "rustmex" version = "0.6.4" -source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git#92a08671955ae1aefe833c6f05d76caec297671c" +source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git?rev=7db6fd878b3ec4a13e5c0a6d6f779c6b81275505#7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" dependencies = [ "cfg-if", "more-asserts", @@ -243,7 +285,7 @@ dependencies = [ [[package]] name = "rustmex-entrypoint" version = "0.4.2" -source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git#92a08671955ae1aefe833c6f05d76caec297671c" +source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git?rev=7db6fd878b3ec4a13e5c0a6d6f779c6b81275505#7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" dependencies = [ "quote", "syn 1.0.109", @@ -252,7 +294,7 @@ dependencies = [ [[package]] name = "rustmex_core" version = "0.3.0" -source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git#92a08671955ae1aefe833c6f05d76caec297671c" +source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git?rev=7db6fd878b3ec4a13e5c0a6d6f779c6b81275505#7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" dependencies = [ "num-complex", ] @@ -260,7 +302,7 @@ dependencies = [ [[package]] name = "rustmex_interleaved_complex" version = "0.2.0" -source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git#92a08671955ae1aefe833c6f05d76caec297671c" +source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git?rev=7db6fd878b3ec4a13e5c0a6d6f779c6b81275505#7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" dependencies = [ "ndarray", "num-complex", @@ -270,7 +312,7 @@ dependencies = [ [[package]] name = "rustmex_matlab800" version = "0.1.2" -source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git#92a08671955ae1aefe833c6f05d76caec297671c" +source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git?rev=7db6fd878b3ec4a13e5c0a6d6f779c6b81275505#7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" dependencies = [ "num-complex", "rustmex_core", @@ -279,7 +321,7 @@ dependencies = [ [[package]] name = "rustmex_separated_complex" version = "0.2.0" -source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git#92a08671955ae1aefe833c6f05d76caec297671c" +source = "git+ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git?rev=7db6fd878b3ec4a13e5c0a6d6f779c6b81275505#7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" dependencies = [ "ndarray", "num-complex", @@ -297,6 +339,7 @@ name = "serial-bridge" version = "0.1.0" dependencies = [ "lazy_static", + "parking_lot", "rustmex", "serialport", "thiserror", @@ -321,6 +364,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "smallvec" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" + [[package]] name = "syn" version = "1.0.109" @@ -399,3 +448,60 @@ name = "winapi-x86_64-pc-windows-gnu" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" + +[[package]] +name = "windows-targets" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +dependencies = [ + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", +] + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" + +[[package]] +name = "windows_i686_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" + +[[package]] +name = "windows_i686_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.48.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" diff --git a/Cargo.toml b/Cargo.toml index 57702118e4f22d83423d81c1fd00a03b9ff66058..89726886247bdea7ad94ed48d8211266c89c97b6 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ thiserror = "1.0.57" [dependencies.rustmex] git = "ssh://git@git.skywarder.eu/avn/swd/third-party/rustmex.git" -ref = "7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" +rev = "7db6fd878b3ec4a13e5c0a6d6f779c6b81275505" # For more information on how to use SSH with Cargo, see: # https://doc.rust-lang.org/cargo/appendix/git-authentication.html#ssh-authentication # https://stackoverflow.com/questions/31704573/is-it-possible-to-have-cargo-fetch-dependencies-from-a-private-remote-git