aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Greig <adam@adamgreig.com> 2019-04-29 13:50:39 +0200
committerGravatar GitHub <noreply@github.com> 2019-04-29 13:50:39 +0200
commit822f660d38d7c01902613e2d052e4d3506bd8eeb (patch)
tree3430b7ee0def7faba0239e6a57b76a50002294cd
parente2e3ecfca4ab6977ddc09d188f63321b395f005b (diff)
parent47336460c7680919a9acf15e6823147db84f4972 (diff)
downloadcortex-m-822f660d38d7c01902613e2d052e4d3506bd8eeb.tar.gz
cortex-m-822f660d38d7c01902613e2d052e4d3506bd8eeb.tar.zst
cortex-m-822f660d38d7c01902613e2d052e4d3506bd8eeb.zip
Merge pull request #143 from rust-embedded/0.5.10v0.5.10
Prepare for 0.5.10 which exports features to 0.6.0
-rw-r--r--Cargo.toml8
1 files changed, 4 insertions, 4 deletions
diff --git a/Cargo.toml b/Cargo.toml
index 946c72b..01dc4fa 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,7 +8,7 @@ license = "MIT OR Apache-2.0"
name = "cortex-m"
readme = "README.md"
repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.5.9"
+version = "0.5.10"
[dependencies]
aligned = "0.2.0"
@@ -17,6 +17,6 @@ volatile-register = "0.2.0"
cortex_m_0_6 = { package = "cortex-m", version = "0.6.0" }
[features]
-cm7-r0p1 = []
-const-fn = ["bare-metal/const-fn"]
-inline-asm = []
+cm7-r0p1 = ["cortex_m_0_6/cm7-r0p1"]
+const-fn = ["bare-metal/const-fn", "cortex_m_0_6/const-fn"]
+inline-asm = ["cortex_m_0_6/inline-asm"]