kai
/
pounder_test
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge #59 

59: deps: bump and mainline serde-json-core r=jordens a=jordens

bors r+

Co-authored-by: Robert Jördens <rj@quartiq.de>
master
bors[bot] 2019-11-20 16:23:35 +00:00 committed by GitHub
parent 78f3a4884b 712f51c015
commit af0c9a4903
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Cargo.lock generated
View File

@ -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)",
@ -313,7 +313,7 @@ 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)",
"serde-json-core 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"smoltcp 0.5.0 (git+https://github.com/m-labs/smoltcp.git?rev=8eb01ac)",
"stm32h7 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)",
]
@ -403,7 +403,7 @@ 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)" = "<none>"
"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)" = "<none>"
"checksum stable_deref_trait 1.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dba1a27d3efae4351c8051072d619e3ade2820635c3958d826bfea39d59b54c8"

15
Cargo.toml
View File

@ -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 = [ ]