aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <26634292+bors[bot]@users.noreply.github.com> 2020-02-05 22:47:43 +0000
committerGravatar GitHub <noreply@github.com> 2020-02-05 22:47:43 +0000
commit30177aa742579b207347a3a04554b1d0c6658f28 (patch)
tree6466461fcb8b74ccfde5585d5146e5dab15d9b64
parente1994fba68774c85ff0ebeb983f4711bb61e4b97 (diff)
parent89dcee6dd1bdc670058e88cf4b2f90861ca808b3 (diff)
downloadcortex-m-30177aa742579b207347a3a04554b1d0c6658f28.tar.gz
cortex-m-30177aa742579b207347a3a04554b1d0c6658f28.tar.zst
cortex-m-30177aa742579b207347a3a04554b1d0c6658f28.zip
Merge #245
245: Change macros crate to same version as cortex-m-rt r=jonas-schievink a=adamgreig Closes #244 Co-authored-by: Adam Greig <adam@adamgreig.com>
-rw-r--r--cortex-m-rt/Cargo.toml2
-rw-r--r--cortex-m-rt/macros/Cargo.toml2
2 files changed, 2 insertions, 2 deletions
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
index bcbd600..dd2a250 100644
--- a/cortex-m-rt/Cargo.toml
+++ b/cortex-m-rt/Cargo.toml
@@ -17,7 +17,7 @@ autoexamples = true
[dependencies]
r0 = "0.2.2"
-cortex-m-rt-macros = { path = "macros", version = "0.1" }
+cortex-m-rt-macros = { path = "macros", version = "=0.6.11" }
[dev-dependencies]
cortex-m = "0.6"
diff --git a/cortex-m-rt/macros/Cargo.toml b/cortex-m-rt/macros/Cargo.toml
index 9beb8f9..eb7c120 100644
--- a/cortex-m-rt/macros/Cargo.toml
+++ b/cortex-m-rt/macros/Cargo.toml
@@ -7,7 +7,7 @@ keywords = ["arm", "cortex-m", "runtime", "startup"]
license = "MIT OR Apache-2.0"
name = "cortex-m-rt-macros"
repository = "https://github.com/japaric/cortex-m-rt"
-version = "0.1.7"
+version = "0.6.11"
edition = "2018"
[lib]