Skip to content

Commit a2d3e93

Browse files
yvtyvt
committed
chore: remove the -Zpackage-features option
It was stabilized by <rust-lang/cargo#8997>.
1 parent 6e5e4c4 commit a2d3e93

File tree

2 files changed

+18
-21
lines changed

2 files changed

+18
-21
lines changed

‎.github/workflows/ci.yml

+1-4
Original file line numberDiff line numberDiff line change
@@ -126,10 +126,7 @@ jobs:
126126
uses: actions-rs/cargo@v1
127127
with:
128128
command: test
129-
# `-Zpackage-features` is an unstable option that allows specifying a
130-
# `--features` + `-p` combination.
131-
# <https://github.com/rust-lang/cargo/issues/5364>
132-
args: -Zpackage-features -p r3_port_std --no-default-features ${{ env.features_param }}
129+
args: -p r3_port_std --no-default-features ${{ env.features_param }}
133130
env:
134131
RUST_LOG: debug
135132

‎doc/testing.md

+17-17
Original file line numberDiff line numberDiff line change
@@ -23,23 +23,23 @@ This document explains how to use the test suite and what is needed to do so.
2323

2424
The following table shows how to run the kernel test suite for each target.
2525

26-
| Architecture | Board | Command |
27-
| --------------- | ---------------------------------------- | ---------------------------------------------------------------------------- |
28-
| Host | Host | `cargo test -p r3_port_std -Zpackage-features --features r3_test_suite/full` |
29-
| Armv7-M+FPU+DSP | [NUCLEO-F401RE] | `cargo run -p r3_test_runner -- -t nucleo_f401re` |
30-
| Armv8-MML+FPU | [Arm MPS2+]​ [AN505]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an505` |
31-
| Armv8-MML | Arm MPS2+ AN505 (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m33` |
32-
| Armv8-MBL | Arm MPS2+ AN505 (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m23` |
33-
| Armv7-M | Arm MPS2+ [AN385]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an385` |
34-
| Armv6-M | Arm MPS2+ AN385 (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an385 -a cortex_m0` |
35-
| Armv7-A | [GR-PEACH] | `cargo run -p r3_test_runner -- -t gr_peach` |
36-
| Armv7-A | [Arm RealView PBX for Cortex-A9]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_realview_pbx_a9` |
37-
| RV32IMAC | [SiFive E]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv32` |
38-
| RV32GC | [SiFive U]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv32` |
39-
| RV64IMAC | SiFive E (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv64` |
40-
| RV64GC | SiFive U (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv64` |
41-
| RV32IMAC | [RED-V]​ (SPI flash XIP) | `cargo run -p r3_test_runner -- -t red_v` |
42-
| RV64GC | [Maix] boards (UART ISP) | `cargo run -p r3_test_runner -- -t maix` |
26+
| Architecture | Board | Command |
27+
| --------------- | ---------------------------------------- | ----------------------------------------------------------------- |
28+
| Host | Host | `cargo test -p r3_port_std --features r3_test_suite/full` |
29+
| Armv7-M+FPU+DSP | [NUCLEO-F401RE] | `cargo run -p r3_test_runner -- -t nucleo_f401re` |
30+
| Armv8-MML+FPU | [Arm MPS2+]​ [AN505]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an505` |
31+
| Armv8-MML | Arm MPS2+ AN505 (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m33` |
32+
| Armv8-MBL | Arm MPS2+ AN505 (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m23` |
33+
| Armv7-M | Arm MPS2+ [AN385]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an385` |
34+
| Armv6-M | Arm MPS2+ AN385 (QEMU) | `cargo run -p r3_test_runner -- -t qemu_mps2_an385 -a cortex_m0` |
35+
| Armv7-A | [GR-PEACH] | `cargo run -p r3_test_runner -- -t gr_peach` |
36+
| Armv7-A | [Arm RealView PBX for Cortex-A9]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_realview_pbx_a9` |
37+
| RV32IMAC | [SiFive E]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv32` |
38+
| RV32GC | [SiFive U]​ (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv32` |
39+
| RV64IMAC | SiFive E (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv64` |
40+
| RV64GC | SiFive U (QEMU) | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv64` |
41+
| RV32IMAC | [RED-V]​ (SPI flash XIP) | `cargo run -p r3_test_runner -- -t red_v` |
42+
| RV64GC | [Maix] boards (UART ISP) | `cargo run -p r3_test_runner -- -t maix` |
4343

4444
[NUCLEO-F401RE]: https://www.st.com/en/evaluation-tools/nucleo-f401re.html
4545
[Arm MPS2+]: https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/mps2

0 commit comments

Comments
 (0)