diff --git a/Cargo.lock b/Cargo.lock index b1729d1..8acb69c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -204,9 +204,9 @@ dependencies = [ [[package]] name = "cxx" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5add3fc1717409d029b20c5b6903fc0c0b02fa6741d820054f4a2efa5e5816fd" +checksum = "51d1075c37807dcf850c379432f0df05ba52cc30f279c5cfc43cc221ce7f8579" dependencies = [ "cc", "cxxbridge-flags", @@ -216,9 +216,9 @@ dependencies = [ [[package]] name = "cxx-build" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4c87959ba14bc6fbc61df77c3fcfe180fc32b93538c4f1031dd802ccb5f2ff0" +checksum = "5044281f61b27bc598f2f6647d480aed48d2bf52d6eb0b627d84c0361b17aa70" dependencies = [ "cc", "codespan-reporting", @@ -231,15 +231,15 @@ dependencies = [ [[package]] name = "cxxbridge-flags" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69a3e162fde4e594ed2b07d0f83c6c67b745e7f28ce58c6df5e6b6bef99dfb59" +checksum = "61b50bc93ba22c27b0d31128d2d130a0a6b3d267ae27ef7e4fae2167dfe8781c" [[package]] name = "cxxbridge-macro" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e7e2adeb6a0d4a282e581096b06e1791532b7d576dcde5ccd9382acf55db8e6" +checksum = "39e61fda7e62115119469c7b3591fd913ecca96fb766cfd3f2e2502ab7bc87a5" dependencies = [ "proc-macro2", "quote", @@ -289,9 +289,9 @@ dependencies = [ [[package]] name = "glob" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9b919933a397b79c37e33b77bb2aa3dc8eb6e165ad809e58ff75bc7db2e34574" +checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b" [[package]] name = "hash32" @@ -568,7 +568,7 @@ dependencies = [ "postcard", "serde", "serde_json", - "spacepackets 0.3.1 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)", + "spacepackets 0.4.0 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git)", "zerocopy", ] @@ -581,7 +581,7 @@ dependencies = [ "delegate", "satrs-core", "satrs-mib", - "spacepackets 0.3.1 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)", + "spacepackets 0.4.0 (git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features)", "zerocopy", ] @@ -685,7 +685,7 @@ checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0" [[package]] name = "spacepackets" -version = "0.3.1" +version = "0.4.0" dependencies = [ "chrono", "crc", @@ -698,8 +698,20 @@ dependencies = [ [[package]] name = "spacepackets" -version = "0.3.1" -source = "git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features#ae55c394bb2455eed3b05a5b587048a931d27238" +version = "0.4.0" +source = "git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git?branch=all_features#03b94fbcde150af685837241a096d6b04f1f5b29" +dependencies = [ + "chrono", + "crc", + "delegate", + "num-traits", + "zerocopy", +] + +[[package]] +name = "spacepackets" +version = "0.4.0" +source = "git+https://egit.irs.uni-stuttgart.de/rust/spacepackets.git#481de83fdb657b8de299b63f1b504299d5e85e31" dependencies = [ "chrono", "crc", @@ -755,9 +767,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.73" +version = "1.0.75" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed01de3de062db82c0920b5cabe804f88d599a3f217932292597c678c903754d" +checksum = "f1212c215a87a183687a7cc7065901b1a98da6b37277d51a1b5faedbb4efd4f3" dependencies = [ "dissimilar", "glob", diff --git a/satrs-core/Cargo.toml b/satrs-core/Cargo.toml index fd5951a..c5f9a4c 100644 --- a/satrs-core/Cargo.toml +++ b/satrs-core/Cargo.toml @@ -47,7 +47,8 @@ optional = true [dependencies.spacepackets] git = "https://egit.irs.uni-stuttgart.de/rust/spacepackets.git" -branch = "all_features" +# branch = "all_features" +version = "0.4.0" default-features = false [dev-dependencies] diff --git a/spacepackets b/spacepackets index ae55c39..481de83 160000 --- a/spacepackets +++ b/spacepackets @@ -1 +1 @@ -Subproject commit ae55c394bb2455eed3b05a5b587048a931d27238 +Subproject commit 481de83fdb657b8de299b63f1b504299d5e85e31