From d93e790a83eca5b8cc43b0a759948353015e751c Mon Sep 17 00:00:00 2001 From: Andre Richter Date: Fri, 17 Jan 2020 21:03:44 +0100 Subject: [PATCH] Cleanup stuff forgotten earlier --- 13_integrated_testing/Makefile | 2 +- 13_integrated_testing/README.md | 3 +-- 13_integrated_testing/patches/Cargo.toml | 5 ----- 13_integrated_testing/patches/src/lib.rs | 24 ------------------------ 4 files changed, 2 insertions(+), 32 deletions(-) delete mode 100644 13_integrated_testing/patches/Cargo.toml delete mode 100644 13_integrated_testing/patches/src/lib.rs diff --git a/13_integrated_testing/Makefile b/13_integrated_testing/Makefile index d029ec5e..1d7c1525 100644 --- a/13_integrated_testing/Makefile +++ b/13_integrated_testing/Makefile @@ -49,7 +49,7 @@ endif QEMU_MISSING_STRING = "This board is not yet supported for QEMU." RUSTFLAGS = -C link-arg=-T$(LINKER_FILE) $(RUSTC_MISC_ARGS) -RUSTFLAGS_PEDANTIC = $(RUSTFLAGS) #-D warnings -D missing_docs +RUSTFLAGS_PEDANTIC = $(RUSTFLAGS) -D warnings -D missing_docs SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld) diff --git a/13_integrated_testing/README.md b/13_integrated_testing/README.md index cb622aa2..32e481ef 100644 --- a/13_integrated_testing/README.md +++ b/13_integrated_testing/README.md @@ -841,8 +841,7 @@ diff -uNr 12_cpu_exceptions_part1/Makefile 13_integrated_testing/Makefile +QEMU_MISSING_STRING = "This board is not yet supported for QEMU." + RUSTFLAGS = -C link-arg=-T$(LINKER_FILE) $(RUSTC_MISC_ARGS) --RUSTFLAGS_PEDANTIC = $(RUSTFLAGS) -D warnings -D missing_docs -+RUSTFLAGS_PEDANTIC = $(RUSTFLAGS) #-D warnings -D missing_docs + RUSTFLAGS_PEDANTIC = $(RUSTFLAGS) -D warnings -D missing_docs SOURCES = $(wildcard **/*.rs) $(wildcard **/*.S) $(wildcard **/*.ld) diff --git a/13_integrated_testing/patches/Cargo.toml b/13_integrated_testing/patches/Cargo.toml deleted file mode 100644 index 2f9c92f5..00000000 --- a/13_integrated_testing/patches/Cargo.toml +++ /dev/null @@ -1,5 +0,0 @@ -[package] -name = "patches" -version = "0.1.0" -authors = ["Andre Richter "] -edition = "2018" diff --git a/13_integrated_testing/patches/src/lib.rs b/13_integrated_testing/patches/src/lib.rs deleted file mode 100644 index 3d27e21c..00000000 --- a/13_integrated_testing/patches/src/lib.rs +++ /dev/null @@ -1,24 +0,0 @@ -// SPDX-License-Identifier: MIT OR Apache-2.0 -// -// Copyright (c) 2019-2020 Andre Richter - -//! Fix for register-rs. -//! -//! Used temporarily until https://github.com/tock/tock/issues/1482 is resolved. - -#![no_std] - -/// A temporary overwrite for tock's register_structs! so that it does not emit `#[test]` attributes. -#[macro_export] -macro_rules! register_structs { - { - $( - $(#[$attr:meta])* - $name:ident { - $( $fields:tt )* - } - ),* - } => { - $( register_fields!(@root $(#[$attr])* $name { $($fields)* } ); )* - }; -}