diff options
| -rw-r--r-- | .github/workflows/build.yml | 18 | ||||
| -rw-r--r-- | Cargo.toml | 5 | ||||
| -rw-r--r-- | book/en/src/by-example/types-send-sync.md | 2 | ||||
| -rw-r--r-- | src/lib.rs | 4 | ||||
| -rw-r--r-- | ui/single/locals-cfg.stderr | 4 | ||||
| -rw-r--r-- | ui/single/resources-cfg.stderr | 4 |
6 files changed, 11 insertions, 26 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e729db6..d9be520 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 @@ -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 = { git = "https://github.com/rtic-rs/rtic-core", branch = "new_monotonic" } #rtic-core = "0.3.1" @@ -106,3 +106,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/book/en/src/by-example/types-send-sync.md b/book/en/src/by-example/types-send-sync.md index a45f179..de812a6 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 <name>`); +can also generate documentation for your binary crate (`cargo doc --bin <name>`); in the documentation you'll find `Context` structs (e.g. `init::Context` and `idle::Context`). @@ -35,7 +35,7 @@ // #![deny(warnings)] #![no_std] -use cortex_m::{interrupt::Nr, peripheral::NVIC}; +use cortex_m::{interrupt::InterruptNumber, peripheral::NVIC}; pub use cortex_m_rtic_macros::app; pub use rtic_core::{ monotonic::{self, embedded_time as time, Monotonic}, @@ -53,7 +53,7 @@ mod tq; /// [`NVIC::pend`](../cortex_m/peripheral/struct.NVIC.html#method.pend) pub fn pend<I>(interrupt: I) where - I: Nr, + I: InterruptNumber, { NVIC::pend(interrupt) } diff --git a/ui/single/locals-cfg.stderr b/ui/single/locals-cfg.stderr index 9319ab4..47992b3 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 e0b82b9..39f2c1a 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 |