From aa90cb1484e77c4c0700d24859b3038fdc15a4ed Mon Sep 17 00:00:00 2001 From: Nicolas Stalder Date: Wed, 30 Dec 2020 00:08:06 +0100 Subject: [PATCH 1/5] Bump cortex-m to 0.7.0 --- Cargo.toml | 5 ++++- src/lib.rs | 4 ++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 9a10ec276f..fee6485ad4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -55,7 +55,7 @@ name = "double_schedule" required-features = ["__v7"] [dependencies] -cortex-m = "0.6.2" +cortex-m = "0.7.0" cortex-m-rtic-macros = { path = "macros", version = "0.6.0-alpha.0" } rtic-core = "0.3.1" heapless = "0.5.0" @@ -105,3 +105,6 @@ debug = false debug-assertions = false opt-level = 0 overflow-checks = false + +[patch.crates-io] +lm3s6965 = { git = "https://github.com/japaric/lm3s6965" } diff --git a/src/lib.rs b/src/lib.rs index f1fb550b53..360ea91d06 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -38,7 +38,7 @@ use core::ops::Sub; use cortex_m::{ - interrupt::Nr, + interrupt::InterruptNumber, peripheral::{CBP, CPUID, DCB, DWT, FPB, FPU, ITM, MPU, NVIC, SCB, TPIU}, }; pub use cortex_m_rtic_macros::app; @@ -158,7 +158,7 @@ pub trait Monotonic { /// [`NVIC::pend`](../cortex_m/peripheral/struct.NVIC.html#method.pend) pub fn pend(interrupt: I) where - I: Nr, + I: InterruptNumber, { NVIC::pend(interrupt) } From 503366c791bc6a323c3545aee7a914e59036f99d Mon Sep 17 00:00:00 2001 From: Nicolas Stalder Date: Mon, 4 Jan 2021 17:57:25 +0100 Subject: [PATCH 2/5] Bump hashes for Rust 1.49 --- ui/single/locals-cfg.stderr | 4 ++-- ui/single/resources-cfg.stderr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index 9319ab4650..47992b3e60 100644 --- a/ui/single/locals-cfg.stderr +++ b/ui/single/locals-cfg.stderr @@ -31,5 +31,5 @@ error[E0425]: cannot find value `FOO` in this scope error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e12de7683a34c500.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr index e0b82b9391..39f2c1aaf6 100644 --- a/ui/single/resources-cfg.stderr +++ b/ui/single/resources-cfg.stderr @@ -1,8 +1,8 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e12de7683a34c500.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta error[E0609]: no field `o1` on type `initResources<'_>` --> $DIR/resources-cfg.rs:47:21 From fa2de97d870e0476cd7a0107193ae426ef8c3997 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 19 Jan 2021 19:38:54 +0100 Subject: [PATCH 3/5] Remove the ci-failure GHA job --- .github/workflows/build.yml | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e729db6775..d9be52008e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -763,21 +763,3 @@ jobs: steps: - name: Mark the job as a success run: exit 0 - ci-failure: - name: ci - if: github.event_name == 'push' && !success() - needs: - - style - - check - - checkexamples - - testexamples - - checkmacros - - testmacros - - testv7 - - testv6 - - docs - - mdbook - runs-on: ubuntu-20.04 - steps: - - name: Mark the job as a failure - run: exit 1 From 7f7c5b025aa75233b35d711b32f13be079b636b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Henrik=20Tj=C3=A4der?= Date: Tue, 19 Jan 2021 20:01:34 +0100 Subject: [PATCH 4/5] Update the hashes related rust --- ui/single/locals-cfg.stderr | 4 ++-- ui/single/resources-cfg.stderr | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index 9319ab4650..47992b3e60 100644 --- a/ui/single/locals-cfg.stderr +++ b/ui/single/locals-cfg.stderr @@ -31,5 +31,5 @@ error[E0425]: cannot find value `FOO` in this scope error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e12de7683a34c500.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta diff --git a/ui/single/resources-cfg.stderr b/ui/single/resources-cfg.stderr index e0b82b9391..39f2c1aaf6 100644 --- a/ui/single/resources-cfg.stderr +++ b/ui/single/resources-cfg.stderr @@ -1,8 +1,8 @@ error: duplicate lang item in crate `panic_halt` (which `$CRATE` depends on): `panic_impl`. | = note: the lang item is first defined in crate `std` (which `$CRATE` depends on) - = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-93cbfed54dd1bac8.rlib - = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-e17d79bd6be439e3.rmeta + = note: first definition in `std` loaded from /usr/share/rust/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/lib/rustlib/x86_64-unknown-linux-gnu/lib/libstd-e12de7683a34c500.rlib + = note: second definition in `panic_halt` loaded from $DIR/target/tests/target/x86_64-unknown-linux-gnu/debug/deps/libpanic_halt-f6dc7d4a3dd7a21d.rmeta error[E0609]: no field `o1` on type `initResources<'_>` --> $DIR/resources-cfg.rs:47:21 From f7767aabea248badccd87a6ceca1d20a2cff9709 Mon Sep 17 00:00:00 2001 From: Barnaby Walters Date: Fri, 5 Feb 2021 23:09:06 +0100 Subject: [PATCH 5/5] Minor grammar correction you -> your --- book/en/src/by-example/types-send-sync.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book/en/src/by-example/types-send-sync.md b/book/en/src/by-example/types-send-sync.md index a45f179e00..de812a60f4 100644 --- a/book/en/src/by-example/types-send-sync.md +++ b/book/en/src/by-example/types-send-sync.md @@ -5,7 +5,7 @@ first parameter. All the fields of these structures have predictable, non-anonymous types so you can write plain functions that take them as arguments. The API reference specifies how these types are generated from the input. You -can also generate documentation for you binary crate (`cargo doc --bin `); +can also generate documentation for your binary crate (`cargo doc --bin `); in the documentation you'll find `Context` structs (e.g. `init::Context` and `idle::Context`).