From 611043f2e292756e9fc97318f24bc0739158aeaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Wed, 20 Nov 2019 17:15:54 +0100 Subject: [PATCH] deps: bump and mainline serde-json-core --- Cargo.lock | 14 +++++++------- Cargo.toml | 15 +++------------ 2 files changed, 10 insertions(+), 19 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 26d7212..3a5250f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -273,8 +273,8 @@ dependencies = [ [[package]] name = "serde-json-core" -version = "0.0.1" -source = "git+https://github.com/quartiq/serde-json-core.git?rev=86d9abf#86d9abf904b668e4b4e7d4c7f2f137699f4d3802" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "heapless 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", @@ -293,7 +293,7 @@ dependencies = [ [[package]] name = "smoltcp" version = "0.5.0" -source = "git+https://github.com/m-labs/smoltcp.git?rev=8eb01ac#8eb01aca364aefe5f823d68d552d62c76c9be4a3" +source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", @@ -313,8 +313,8 @@ dependencies = [ "panic-halt 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", "panic-semihosting 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)", "serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)", - "serde-json-core 0.0.1 (git+https://github.com/quartiq/serde-json-core.git?rev=86d9abf)", - "smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01ac)", + "serde-json-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", + "smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)", "stm32h7 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", ] @@ -403,9 +403,9 @@ dependencies = [ "checksum semver 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" "checksum semver-parser 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" "checksum serde 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "0c4b39bd9b0b087684013a792c59e3e07a46a01d2322518d8a1104641a0b1be0" -"checksum serde-json-core 0.0.1 (git+https://github.com/quartiq/serde-json-core.git?rev=86d9abf)" = "" +"checksum serde-json-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cbf406405ada9ef326ca78677324ac66994ff348fc48a16030be08caeed29825" "checksum serde_derive 1.0.102 (registry+https://github.com/rust-lang/crates.io-index)" = "ca13fc1a832f793322228923fbb3aba9f3f44444898f835d31ad1b74fa0a2bf8" -"checksum smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01ac)" = "" +"checksum smoltcp 0.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fef582369edb298c6c41319a544ca9c4e83622f226055ccfcb35974fbb55ed34" "checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8" "checksum stm32h7 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6fd678579307324f1890552fe644331ce0a46607f2466aac8609f782d9b26524" "checksum syn 1.0.8 (registry+https://github.com/rust-lang/crates.io-index)" = "661641ea2aa15845cddeb97dad000d22070bb5c1fb456b96c1cba883ec691e92" diff --git a/Cargo.toml b/Cargo.toml index c09590f..2ba5f74 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,15 +35,9 @@ panic-semihosting = { version = "0.5", optional = true } panic-halt = { version = "0.2" } serde = { version = "1.0", features = ["derive"], default-features = false } heapless = { version = "0.5" } - -[dependencies.serde-json-core] -# version = "0.0" -git = "https://github.com/quartiq/serde-json-core.git" -rev = "86d9abf" - -[dependencies.stm32h7] -version = "0.9" -features = ["stm32h743", "rt"] +serde-json-core = { version = "0.1" } +stm32h7 = { version = "0.9", features = ["stm32h743", "rt"] } +cortex-m-rtfm = { version = "0.5" } [dependencies.smoltcp] git = "https://github.com/m-labs/smoltcp.git" @@ -51,9 +45,6 @@ rev = "8eb01ac" features = ["ethernet", "proto-ipv4", "socket-tcp"] default-features = false -[dependencies.cortex-m-rtfm] -version = "0.5" - [features] semihosting = ["panic-semihosting", "cortex-m-log/semihosting"] bkpt = [ ]