Skip to content

GitLab

Commit 1b4e024d authored by Astro's avatar Astro ⚙
Browse files

Merge branch 'alloc-cortex-m-patch' into 'master' 

patch alloc-cortex-m

See merge request !24
parents 26d20f6e b73a8023
Pipeline #4520 failed with stage
in 12 minutes and 9 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 6 deletions
Cargo.lock
View file @ 1b4e024d
......@@ -11,10 +11,10 @@ dependencies = [
[[package]]
name = "alloc-cortex-m"
version = "0.3.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
source = "git+https://github.com/rust-embedded/alloc-cortex-m#761502c1c7da901d87f7ed39c000f3a80feacc13"
dependencies = [
"cortex-m 0.1.8 (registry+https://github.com/rust-lang/crates.io-index)",
"linked_list_allocator 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
"linked_list_allocator 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
......@@ -71,7 +71,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
name = "card10-alloc"
version = "0.1.1"
dependencies = [
"alloc-cortex-m 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)",
"alloc-cortex-m 0.3.5 (git+https://github.com/rust-embedded/alloc-cortex-m)",
"card10-sys 1.10.0",
]
......@@ -226,7 +226,7 @@ dependencies = [
[[package]]
name = "linked_list_allocator"
version = "0.6.4"
version = "0.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
......@@ -411,7 +411,7 @@ dependencies = [
[metadata]
"checksum aho-corasick 0.7.6 (registry+https://github.com/rust-lang/crates.io-index)" = "58fb5e95d83b38284460a5fda7d6470aa0b8844d283a0b614b8535e880800d2d"
"checksum alloc-cortex-m 0.3.5 (registry+https://github.com/rust-lang/crates.io-index)" = "6d5f7d01bc93ce089de636f946f7f1fdc5e5d751732367e019c9755440e7aef4"
"checksum alloc-cortex-m 0.3.5 (git+https://github.com/rust-embedded/alloc-cortex-m)" = "<none>"
"checksum ansi_term 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b"
"checksum atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)" = "1803c647a3ec87095e7ae7acfca019e98de5ec9a7d01343f611cf3152ed71a90"
"checksum bindgen 0.52.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f1c85344eb535a31b62f0af37be84441ba9e7f0f4111eb0530f43d15e513fe57"
......@@ -431,7 +431,7 @@ dependencies = [
"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
"checksum libc 0.2.66 (registry+https://github.com/rust-lang/crates.io-index)" = "d515b1f41455adea1313a4a2ac8a8a477634fbae63cc6100e3aebb207ce61558"
"checksum libloading 0.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "f2b111a074963af1d37a139918ac6d49ad1d0d5e47f72fd55388619691a7d753"
"checksum linked_list_allocator 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "47314ec1d29aa869ee7cb5a5be57be9b1055c56567d59c3fb6689926743e0bea"
"checksum linked_list_allocator 0.8.1 (registry+https://github.com/rust-lang/crates.io-index)" = "5825aea823c659d0fdcdbe8c9b78baf56f3a10365d783db874f6d360df72626f"
"checksum log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)" = "14b6052be84e6b71ab17edffc2eeabf5c2c3ae1fdb464aae35ac50c67a44e1f7"
"checksum memchr 2.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "88579771288728879b57485cc7d6b07d648c9f0141eb955f8ab7f9d45394468e"
"checksum nom 4.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "2ad2a91a8e869eeb30b9cb3119ae87773a8f4ae617f41b1eb9c154b2905f7bd6"
......
Cargo.toml
View file @ 1b4e024d
......@@ -21,3 +21,6 @@ debug = true
opt-level = "s"
lto = true
panic = "abort"
[patch.crates-io]
alloc-cortex-m = { git = 'https://github.com/rust-embedded/alloc-cortex-m' }
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment