Update GHA for integrated cortex-m-rt

13 files changed, 20 insertions, 63 deletions

diff --git a/.github/bors.toml b/.github/bors.toml
index 0cf10c7..2bfc949 100644
--- a/.github/bors.toml
+++ b/.github/bors.toml
@@ -4,6 +4,10 @@ required_approvals = 1
 status = [
   "ci-linux (stable)",
   "ci-linux (1.40.0)",
+  "rt-ci-linux (stable)",
+  "rt-ci-linux (1.39.0)",
+  "rt-ci-other-os (macOS-latest)",
+  "rt-ci-other-os (windows-latest)",
   "rustfmt",
   "clippy",
 ]
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8600054..1e1a7c1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,7 +3,7 @@ on:
     branches: [ staging, trying, master ]
   pull_request:
 
-name: CI
+name: cortex-m CI
 
 jobs:
   ci-linux:
diff --git a/.github/workflows/clippy.yml b/.github/workflows/clippy.yml
index d55d697..5a76037 100644
--- a/.github/workflows/clippy.yml
+++ b/.github/workflows/clippy.yml
@@ -23,3 +23,4 @@ jobs:
       - uses: actions-rs/clippy-check@v1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
+          args: --all
diff --git a/cortex-m-rt/.github/workflows/ci.yml b/.github/workflows/rt-ci.yml
index 2ddf970..d63d7b8 100644
--- a/cortex-m-rt/.github/workflows/ci.yml
+++ b/.github/workflows/rt-ci.yml
@@ -3,10 +3,10 @@ on:
     branches: [ staging, trying, master ]
   pull_request:
 
-name: Continuous integration
+name: cortex-m-rt CI
 
 jobs:
-  ci-linux:
+  rt-ci-linux:
     runs-on: ubuntu-20.04
     continue-on-error: ${{ matrix.experimental || false }}
     strategy:
@@ -48,7 +48,7 @@ jobs:
         run: TARGET=thumbv8m.main-none-eabihf TRAVIS_RUST_VERSION=${{ matrix.rust }} bash ci/script.sh
 
   # On macOS and Windows, we at least make sure that all examples build and link.
-  build-other:
+  rt-ci-other-os:
     strategy:
       matrix:
         os:
diff --git a/Cargo.toml b/Cargo.toml
index ead7e2e..8527a89 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -34,7 +34,13 @@ linker-plugin-lto = []
 std = []
 
 [workspace]
-members = ["xtask", "cortex-m-semihosting", "panic-semihosting", "panic-itm"]
+members = [
+    "xtask",
+    "cortex-m-rt",
+    "cortex-m-semihosting",
+    "panic-semihosting",
+    "panic-itm"
+]
 
 [package.metadata.docs.rs]
 targets = [
diff --git a/cortex-m-rt/.github/CODEOWNERS b/cortex-m-rt/.github/CODEOWNERS
deleted file mode 100644
index 21baf47..0000000
--- a/cortex-m-rt/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @rust-embedded/cortex-m
diff --git a/cortex-m-rt/.github/bors.toml b/cortex-m-rt/.github/bors.toml
deleted file mode 100644
index 9b9d884..0000000
--- a/cortex-m-rt/.github/bors.toml
+++ /dev/null
@@ -1,10 +0,0 @@
-block_labels = ["needs-decision"]
-delete_merged_branches = true
-required_approvals = 1
-status = [
-  "ci-linux (stable)",
-  "ci-linux (1.39.0)",
-  "build-other (macOS-latest)",
-  "build-other (windows-latest)",
-  "Rustfmt"
-]
diff --git a/cortex-m-rt/.github/workflows/clippy.yml b/cortex-m-rt/.github/workflows/clippy.yml
deleted file mode 100644
index adc3a6e..0000000
--- a/cortex-m-rt/.github/workflows/clippy.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
-
-name: Clippy check
-jobs:
-  clippy_check:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: clippy
-      - uses: actions-rs/clippy-check@v1
-        with:
-          token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/cortex-m-rt/.github/workflows/rustfmt.yml b/cortex-m-rt/.github/workflows/rustfmt.yml
deleted file mode 100644
index 9a55c00..0000000
--- a/cortex-m-rt/.github/workflows/rustfmt.yml
+++ /dev/null
@@ -1,23 +0,0 @@
-on:
-  push:
-    branches: [ staging, trying, master ]
-  pull_request:
-
-name: Code formatting check
-
-jobs:
-  fmt:
-    name: Rustfmt
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions-rs/toolchain@v1
-        with:
-          profile: minimal
-          toolchain: stable
-          override: true
-          components: rustfmt
-      - uses: actions-rs/cargo@v1
-        with:
-          command: fmt
-          args: --all -- --check
diff --git a/cortex-m-rt/Cargo.toml b/cortex-m-rt/Cargo.toml
index 7250384..8e4de1f 100644
--- a/cortex-m-rt/Cargo.toml
+++ b/cortex-m-rt/Cargo.toml
@@ -11,7 +11,7 @@ keywords = ["arm", "cortex-m", "runtime", "startup"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rt"
 readme = "README.md"
-repository = "https://github.com/rust-embedded/cortex-m-rt"
+repository = "https://github.com/rust-embedded/cortex-m"
 version = "0.7.1"
 autoexamples = true
 links = "cortex-m-rt" # Prevent multiple versions of cortex-m-rt being linked
@@ -22,7 +22,7 @@ cortex-m-rt-macros = { path = "macros", version = "=0.7.0" }
 # avoid pulling in multiple versions of `cortex-m`.
 
 [dev-dependencies]
-cortex-m = "0.7.1"
+cortex-m = { version = "0.7.4", path = ".." }
 panic-halt = "0.2.0"
 cortex-m-semihosting = "0.3"
 
diff --git a/cortex-m-rt/macros/Cargo.toml b/cortex-m-rt/macros/Cargo.toml
index fc13dac..c73ebc1 100644
--- a/cortex-m-rt/macros/Cargo.toml
+++ b/cortex-m-rt/macros/Cargo.toml
@@ -6,7 +6,7 @@ documentation = "https://docs.rs/cortex-m-rt"
 keywords = ["arm", "cortex-m", "runtime", "startup"]
 license = "MIT OR Apache-2.0"
 name = "cortex-m-rt-macros"
-repository = "https://github.com/rust-embedded/cortex-m-rt"
+repository = "https://github.com/rust-embedded/cortex-m"
 version = "0.7.0"
 edition = "2018"
 
diff --git a/cortex-m-rt/triagebot.toml b/cortex-m-rt/triagebot.toml
deleted file mode 100644
index fa0824a..0000000
--- a/cortex-m-rt/triagebot.toml
+++ /dev/null
@@ -1 +0,0 @@
-[assign]
diff --git a/src/peripheral/itm.rs b/src/peripheral/itm.rs
index f8e9e25..7291ae0 100644
--- a/src/peripheral/itm.rs
+++ b/src/peripheral/itm.rs
@@ -118,6 +118,7 @@ impl core::convert::TryFrom<u8> for LocalTimestampOptions {
     /// Converts an integer value to an enabled [LocalTimestampOptions]
     /// variant. Accepted values are: 1, 4, 16, 64. Any other value
     /// yields `Err(())`.
+    #[inline]
     fn try_from(value: u8) -> Result<Self, Self::Error> {
         match value {
             1 => Ok(Self::Enabled),