10 files changed, 3 insertions, 157 deletions
diff --git a/panic-semihosting/.github/CODEOWNERS b/panic-semihosting/.github/CODEOWNERS
deleted file mode 100644
index d810925..0000000
--- a/panic-semihosting/.github/CODEOWNERS
+++ /dev/null
@@ -1 +0,0 @@
-* @rust-embedded/cortex-m
-\ No newline at end of file
diff --git a/panic-semihosting/.github/bors.toml b/panic-semihosting/.github/bors.toml
deleted file mode 100644
index ca42be0..0000000
--- a/panic-semihosting/.github/bors.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-block_labels = ["needs-decision"]
-delete_merged_branches = true
-required_approvals = 1
-status = ["continuous-integration/travis-ci/push"]
diff --git a/panic-semihosting/.gitignore b/panic-semihosting/.gitignore
deleted file mode 100644
index 2691a8f..0000000
--- a/panic-semihosting/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-**/*.rs.bk
-.#*
-/target
-Cargo.lock
diff --git a/panic-semihosting/.travis.yml b/panic-semihosting/.travis.yml
deleted file mode 100644
index 9121565..0000000
--- a/panic-semihosting/.travis.yml
+++ /dev/null
@@ -1,105 +0,0 @@
-language: rust
-
-matrix:
-  include:
-    - env: TARGET=x86_64-unknown-linux-gnu
-      rust: stable
-
-    - env: TARGET=thumbv6m-none-eabi
-      rust: stable
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7m-none-eabi
-      rust: stable
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7em-none-eabi
-      rust: stable
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7em-none-eabihf
-      rust: stable
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=x86_64-unknown-linux-gnu
-      rust: nightly
-
-    - env: TARGET=thumbv6m-none-eabi
-      rust: nightly
-      addons:
-        apt:
-          packages:
-            - gcc-arm-none-eabi
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7m-none-eabi
-      rust: nightly
-      addons:
-        apt:
-          packages:
-            - gcc-arm-none-eabi
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7em-none-eabi
-      rust: nightly
-      addons:
-        apt:
-          packages:
-            - gcc-arm-none-eabi
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7em-none-eabihf
-      rust: nightly
-      addons:
-        apt:
-          packages:
-            - gcc-arm-none-eabi
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    # MSRV
-    - env: TARGET=x86_64-unknown-linux-gnu
-      rust: 1.32.0
-
-    - env: TARGET=thumbv6m-none-eabi
-      rust: 1.32.0
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7m-none-eabi
-      rust: 1.32.0
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7em-none-eabi
-      rust: 1.32.0
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-    - env: TARGET=thumbv7em-none-eabihf
-      rust: 1.32.0
-      if: (branch = staging OR branch = trying) OR (type = pull_request AND branch = master)
-
-before_install: set -e
-
-install:
-  - bash ci/install.sh
-
-script:
-  - bash ci/script.sh
-
-after_success:
-  - bash ci/after-success.sh
-
-after_script: set +e
-
-cache: cargo
-
-before_cache:
-  - chmod -R a+r $HOME/.cargo;
-
-branches:
-  only:
-    - master
-    - staging
-    - trying
-
-notifications:
-  email:
-    on_success: never
diff --git a/panic-semihosting/Cargo.toml b/panic-semihosting/Cargo.toml
index 708c029..c09bced 100644
--- a/panic-semihosting/Cargo.toml
+++ b/panic-semihosting/Cargo.toml
@@ -13,8 +13,8 @@ repository = "https://github.com/rust-embedded/panic-semihosting"
 version = "0.5.3"
 
 [dependencies]
-cortex-m = ">= 0.5.6, < 0.7"
-cortex-m-semihosting = "0.3"
+cortex-m = { path = "..", version = ">= 0.5.6, < 0.7" }
+cortex-m-semihosting = { path = "../cortex-m-semihosting", version = "0.3" }
 
 [features]
 exit = []
diff --git a/panic-semihosting/ci/after-success.sh b/panic-semihosting/ci/after-success.sh
deleted file mode 100644
index 4377267..0000000
--- a/panic-semihosting/ci/after-success.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-set -euxo pipefail
-
-main() {
-    cargo doc
-
-    mkdir ghp-import
-
-    curl -Ls https://github.com/davisp/ghp-import/archive/master.tar.gz |
-        tar --strip-components 1 -C ghp-import -xz
-
-    ./ghp-import/ghp_import.py target/doc
-
-    set +x
-    git push -fq https://$GH_TOKEN@github.com/$TRAVIS_REPO_SLUG.git gh-pages && echo OK
-}
-
-# only publish on successful merges to master
-if [ $TRAVIS_BRANCH = master ] && [ $TRAVIS_PULL_REQUEST = false ] && [ $TARGET = x86_64-unknown-linux-gnu ]; then
-    main
-fi
diff --git a/panic-semihosting/ci/install.sh b/panic-semihosting/ci/install.sh
deleted file mode 100644
index 3c41921..0000000
--- a/panic-semihosting/ci/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-set -euxo pipefail
-
-main() {
-    if [ $TARGET != x86_64-unknown-linux-gnu ]; then
-        rustup target add $TARGET
-    fi
-}
-
-main
diff --git a/panic-semihosting/ci/script.sh b/panic-semihosting/ci/script.sh
deleted file mode 100644
index eb1a313..0000000
--- a/panic-semihosting/ci/script.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-set -euxo pipefail
-
-main() {
-    cargo check --target $TARGET
-
-    if [ $TRAVIS_RUST_VERSION = nightly ]; then
-        cargo check --target $TARGET --features inline-asm
-    fi
-}
-
-main
diff --git a/panic-semihosting/src/lib.rs b/panic-semihosting/src/lib.rs
index 71d2774..1db7b72 100644
--- a/panic-semihosting/src/lib.rs
+++ b/panic-semihosting/src/lib.rs
@@ -56,6 +56,7 @@
 //! When this feature is disabled semihosting is implemented using FFI calls into an external
 //! assembly file and compiling this crate works on stable and beta.
 
+#![cfg(all(target_arch = "arm", target_os = "none"))]
 #![deny(missing_docs)]
 #![deny(warnings)]
 #![no_std]
diff --git a/panic-semihosting/triagebot.toml b/panic-semihosting/triagebot.toml
deleted file mode 100644
index fa0824a..0000000
--- a/panic-semihosting/triagebot.toml
+++ /dev/null
@@ -1 +0,0 @@
-[assign]