Merge pull request #451 from AfoHT/v0.5.x-mdbookupdate

Fix the CI tests by using latest mdbook, switching to panic-semihosting
This commit is contained in:
Henrik Tjäder 2021-03-03 11:21:56 +01:00 committed by GitHub
commit 6f0985d470
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
17 changed files with 19 additions and 39 deletions

View file

@ -628,9 +628,9 @@ jobs:
run: pip install git+https://github.com/linkchecker/linkchecker.git run: pip install git+https://github.com/linkchecker/linkchecker.git
- name: mdBook Action - name: mdBook Action
uses: peaceiris/actions-mdbook@v1.1.11 uses: peaceiris/actions-mdbook@v1
with: with:
mdbook-version: '0.3.1' mdbook-version: 'latest'
- name: Build book in English - name: Build book in English
run: cd book/en && mdbook build run: cd book/en && mdbook build
@ -682,10 +682,9 @@ jobs:
run: python -c "import sys; print(sys.version)" run: python -c "import sys; print(sys.version)"
- name: mdBook Action - name: mdBook Action
uses: peaceiris/actions-mdbook@v1.1.11 uses: peaceiris/actions-mdbook@v1
with: with:
mdbook-version: '0.3.1' mdbook-version: 'latest'
# mdbook-version: 'latest'
- name: Remove cargo-config - name: Remove cargo-config
run: rm -f .cargo/config run: rm -f .cargo/config

View file

@ -66,7 +66,6 @@ version = "0.1.0-alpha.2"
[dev-dependencies] [dev-dependencies]
lm3s6965 = "0.1.3" lm3s6965 = "0.1.3"
panic-halt = "0.2.0"
cortex-m-semihosting = "0.3.3" cortex-m-semihosting = "0.3.3"
[dev-dependencies.panic-semihosting] [dev-dependencies.panic-semihosting]

View file

@ -18,8 +18,8 @@ There is a translation of this book in [Russian].
This is the documentation of v0.5.x of RTIC; for the documentation of This is the documentation of v0.5.x of RTIC; for the documentation of
* development version go [here](/dev). * development version go [here](/dev/).
* v0.4.x go [here](/0.4). * v0.4.x go [here](/0.4/).
{{#include ../../../README.md:7:46}} {{#include ../../../README.md:7:46}}

View file

@ -8,7 +8,7 @@
use core::marker::PhantomData; use core::marker::PhantomData;
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
use panic_halt as _; use panic_semihosting as _;
use rtic::app; use rtic::app;
pub struct NotSend { pub struct NotSend {

View file

@ -8,7 +8,7 @@
use core::marker::PhantomData; use core::marker::PhantomData;
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
use panic_halt as _; use panic_semihosting as _;
pub struct NotSync { pub struct NotSync {
_0: PhantomData<*const ()>, _0: PhantomData<*const ()>,

View file

@ -7,7 +7,7 @@
use cortex_m::peripheral::DWT; use cortex_m::peripheral::DWT;
use cortex_m_semihosting::hprintln; use cortex_m_semihosting::hprintln;
use panic_halt as _; use panic_semihosting as _;
use rtic::cyccnt::{Instant, U32Ext as _}; use rtic::cyccnt::{Instant, U32Ext as _};
// NOTE: does NOT work on QEMU! // NOTE: does NOT work on QEMU!

View file

@ -7,7 +7,7 @@
use cortex_m_semihosting::debug; use cortex_m_semihosting::debug;
use lm3s6965::Interrupt; use lm3s6965::Interrupt;
use panic_halt as _; use panic_semihosting as _;
use rtic::app; use rtic::app;
pub struct MustBeSend; pub struct MustBeSend;

View file

@ -5,7 +5,7 @@
#![no_main] #![no_main]
#![no_std] #![no_std]
use panic_halt as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965)] #[rtic::app(device = lm3s6965)]
const APP: () = { const APP: () = {

View file

@ -3,7 +3,7 @@
#![no_main] #![no_main]
#![no_std] #![no_std]
use panic_halt as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965)] #[rtic::app(device = lm3s6965)]
const APP: () = { const APP: () = {

View file

@ -3,7 +3,7 @@
#![no_main] #![no_main]
#![no_std] #![no_std]
use panic_halt as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]
const APP: () = { const APP: () = {

View file

@ -5,7 +5,7 @@
use core::marker::PhantomData; use core::marker::PhantomData;
use panic_halt as _; use panic_semihosting as _;
pub struct NotSend { pub struct NotSend {
_0: PhantomData<*const ()>, _0: PhantomData<*const ()>,

View file

@ -5,7 +5,7 @@
#![no_main] #![no_main]
#![no_std] #![no_std]
use panic_halt as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965)] #[rtic::app(device = lm3s6965)]
const APP: () = { const APP: () = {

View file

@ -5,7 +5,7 @@
#![no_main] #![no_main]
#![no_std] #![no_std]
use panic_halt as _; use panic_semihosting as _;
use rtic::cyccnt::{Instant, U32Ext as _}; use rtic::cyccnt::{Instant, U32Ext as _};
#[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)] #[rtic::app(device = lm3s6965, monotonic = rtic::cyccnt::CYCCNT)]

View file

@ -5,7 +5,7 @@
#![no_main] #![no_main]
#![no_std] #![no_std]
use panic_halt as _; use panic_semihosting as _;
#[rtic::app(device = lm3s6965)] #[rtic::app(device = lm3s6965)]
const APP: () = { const APP: () = {

View file

@ -27,11 +27,3 @@ error[E0425]: cannot find value `FOO` in this scope
| |
44 | FOO; 44 | FOO;
| ^^^ not found in this scope | ^^^ not found in this scope
error: duplicate lang item in crate `panic_halt`: `panic_impl`.
|
= note: first defined in crate `std`.
error: duplicate lang item in crate `panic_semihosting`: `panic_impl`.
|
= note: first defined in crate `panic_halt`.

View file

@ -1,7 +1,5 @@
#![no_main] #![no_main]
use rtic::app;
#[rtic::app(device = lm3s6965)] #[rtic::app(device = lm3s6965)]
const APP: () = { const APP: () = {
#[init] #[init]

View file

@ -1,13 +1,5 @@
warning: unused import: `rtic::app`
--> $DIR/task-priority-too-high.rs:3:5
|
3 | use rtic::app;
| ^^^^^^^^^
|
= note: #[warn(unused_imports)] on by default
error[E0080]: evaluation of constant value failed error[E0080]: evaluation of constant value failed
--> $DIR/task-priority-too-high.rs:5:1 --> $DIR/task-priority-too-high.rs:3:1
| |
5 | #[rtic::app(device = lm3s6965)] 3 | #[rtic::app(device = lm3s6965)]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ attempt to subtract with overflow