aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2018-09-06 15:04:20 +0000
committerGravatar bors[bot] <bors[bot]@users.noreply.github.com> 2018-09-06 15:04:20 +0000
commitb947f36aa5cc7316dce2e7d012978740fb166dc3 (patch)
tree97b990145e86a939be4fc03df187ef465de12469
parent338d00c1b301446bb558873695df980142c69b9e (diff)
parent638f707dd39d2af10e36e505d0d83b9664ed0177 (diff)
downloadcortex-m-b947f36aa5cc7316dce2e7d012978740fb166dc3.tar.gz
cortex-m-b947f36aa5cc7316dce2e7d012978740fb166dc3.tar.zst
cortex-m-b947f36aa5cc7316dce2e7d012978740fb166dc3.zip
Merge #104
104: v0.6.0, take 2 r=therealprof a=japaric the dev-dependency of cortex-m-rt-macros needs to specify a version or can't be published; this commit fixes that docs.rs won't be able to build docs for these two crates so this also changes the documentation link to https://rust-embedded.github.io/cortex-m-rt/ where I have (manually) implemented a poor man's docs.rs now we should be able to publish a new version r? @rust-embedded/cortex-m (anyone) Co-authored-by: Jorge Aparicio <jorge@japaric.io>
-rw-r--r--cortex-m-rt/Cargo.toml4
-rw-r--r--cortex-m-rt/macros/Cargo.toml10
2 files changed, 10 insertions, 4 deletions
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
index dd55bb5..2035bf4 100644
--- a/cortex-m-rt/Cargo.toml
+++ b/cortex-m-rt/Cargo.toml
@@ -2,11 +2,11 @@
authors = ["Jorge Aparicio <jorge@japaric.io>"]
categories = ["embedded", "no-std"]
description = "Minimal runtime / startup for Cortex-M microcontrollers"
-documentation = "https://docs.rs/cortex-m-rt"
-readme = "README.md"
+documentation = "https://rust-embedded.github.io/cortex-m-rt/"
keywords = ["arm", "cortex-m", "runtime", "startup"]
license = "MIT OR Apache-2.0"
name = "cortex-m-rt"
+readme = "README.md"
repository = "https://github.com/japaric/cortex-m-rt"
version = "0.6.0"
diff --git a/cortex-m-rt/macros/Cargo.toml b/cortex-m-rt/macros/Cargo.toml
index d0644ee..21a6795 100644
--- a/cortex-m-rt/macros/Cargo.toml
+++ b/cortex-m-rt/macros/Cargo.toml
@@ -1,7 +1,13 @@
[package]
+authors = ["Jorge Aparicio <jorge@japaric.io>"]
+categories = ["embedded", "no-std"]
+description = "Attributes re-exported in `cortex-m-rt`"
+documentation = "https://rust-embedded.github.io/cortex-m-rt"
+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.0"
-authors = ["Jorge Aparicio <jorge@japaric.io>"]
[lib]
proc-macro = true
@@ -16,4 +22,4 @@ features = ["extra-traits", "full"]
version = "0.14.8"
[dev-dependencies]
-cortex-m-rt = { path = ".." }
+cortex-m-rt = { path = "..", version = "0.6.0" }