Merge #315

315: Add forwards-compatible v0.6.5 r=thalesfragoso a=adamgreig

This PR creates a new v0.6.5 on the v0.6.x branch, which depends on v0.7 and re-exports many of its types.

Notable changes:

* The `links` field is removed from Cargo.toml to permit linking to v0.7 series
* The `#[no_mangle] CORE_PERIPHERALS` static is removed to permit linking to v0.7 series
* The `TAKEN` static is removed: sadly we can't access the 0.7 static because it's not pub, so instead this version calls `take()` and `steal()` from v0.7 to ensure only one version of `PERIPHERALS` (from either 0.6 or 0.7) can exist at once.
* As in v0.5.10, we transmute a unit tuple into `PERIPHERALS` as we can no longer construct many of its types.
* I've removed the old Travis config and copied the GHA CI/clippy runs back into this branch so hopefully they run (and pass!) here.

Types that are *not* exported from 0.7:

* ITM, MPU, NVIC, SCB all have breaking changes, though some smaller types within those modules are re-exported.
* in `register`, we keep `basepri`, `basepri_max`, `lr`, `pc`, `apsr` only for the targets which 0.7 no longer exports them for.

I've tested that using this version builds on several projects that currently use 0.6.4, including using RTIC, various STM32 PACs, etc, and including changing those projects to use c-m 0.7 at the top level but continue to depend on other crates (PACs, RTIC, etc) that use 0.6.4. They all build. Nevertheless I'd definitely appreciate more testing on this. We could even do a prerelease on crates.io?

Co-authored-by: Adam Greig <[email protected]>

Author: bors[bot]

.github/bors.toml

@@ -1,4 +1,8 @@
 block_labels = ["needs-decision"]
 delete_merged_branches = true
 required_approvals = 1
-status = ["continuous-integration/travis-ci/push"]
+status = [
+    "ci-linux (stable)",
+    "ci-linux (1.38.0)",
+    "clippy",
+]

.github/workflows/ci.yml

@@ -0,0 +1,34 @@
+on:
+  push:
+    branches: [ staging, trying, master ]
+  pull_request:
+
+name: CI
+
+jobs:
+  ci-linux:
+    runs-on: ubuntu-latest
+    continue-on-error: ${{ matrix.experimental || false }}
+    strategy:
+      matrix:
+        # All generated code should be running on stable now
+        rust: [stable]
+
+        include:
+          # Test MSRV
+          - rust: 1.38.0
+
+          # Test nightly but don't fail
+          - rust: nightly
+            experimental: true
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions-rs/toolchain@v1
+        with:
+          profile: minimal
+          toolchain: ${{ matrix.rust }}
+          override: true
+      - name: Run tests
+        run: cargo test --all
+
+# FIXME: test on macOS and Windows

.github/workflows/clippy.yml

@@ -0,0 +1,25 @@
+on:
+  push:
+    branches: [ staging, trying, master ]
+  pull_request_target:
+
+name: Clippy check
+jobs:
+  clippy:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        if: github.event_name == 'pull_request_target'
+        with:
+          ref: refs/pull/${{ github.event.number }}/head
+      - uses: actions/checkout@v2
+        if: github.event_name != 'pull_request_target'
+      - 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 }}

.travis.yml

@@ -7,6 +7,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+## [v0.6.5] - 2021-01-13
+
+### Changed
+
+- This release is forwards-compatible with cortex-m 0.7, and depends on and
+  re-exports many types from that version. Both 0.6.5 and 0.7 may co-exist
+  in a build.
+
 ## [v0.6.4] - 2020-10-26
 
 ### Changed

CHANGELOG.md

@@ -11,17 +11,17 @@ license = "MIT OR Apache-2.0"
 name = "cortex-m"
 readme = "README.md"
 repository = "https://github.com/rust-embedded/cortex-m"
-version = "0.6.4"
+version = "0.6.5-alpha"
 edition = "2018"
-links = "cortex-m"  # prevent multiple versions of this crate to be linked together
 
 [dependencies]
 aligned = "0.3.1"
 bare-metal = { version = "0.2.0", features = ["const-fn"] }
 volatile-register = "0.2.0"
 bitfield = "0.13.2"
+cortex_m_0_7 = { package = "cortex-m", version = "0.7.0" }
 
 [features]
 const-fn = []
-cm7-r0p1 = []
-inline-asm = []
+cm7-r0p1 = ["cortex_m_0_7/cm7-r0p1"]
+inline-asm = ["cortex_m_0_7/inline-asm"]

Cargo.toml

@@ -1,20 +1,7 @@
-use std::path::PathBuf;
-use std::{env, fs};
+use std::env;
 
 fn main() {
     let target = env::var("TARGET").unwrap();
-    let out_dir = PathBuf::from(env::var("OUT_DIR").unwrap());
-    let name = env::var("CARGO_PKG_NAME").unwrap();
-
-    if target.starts_with("thumb") {
-        fs::copy(
-            format!("bin/{}.a", target),
-            out_dir.join(format!("lib{}.a", name)),
-        ).unwrap();
-
-        println!("cargo:rustc-link-lib=static={}", name);
-        println!("cargo:rustc-link-search={}", out_dir.display());
-    }
 
     if target.starts_with("thumbv6m-") {
         println!("cargo:rustc-cfg=cortex_m");