chore: remove the -Zpackage-features option

It was stabilized by <rust-lang/cargo#8997>.
r3-os · Jan 31, 2021 · a2d3e93 · a2d3e93
1 parent 6e5e4c4
commit a2d3e93
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -126,10 +126,7 @@ jobs:
         uses: actions-rs/cargo@v1
         with:
           command: test
-          # `-Zpackage-features` is an unstable option that allows specifying a
-          # `--features` + `-p` combination.
-          # <https://github.com/rust-lang/cargo/issues/5364>
-          args: -Zpackage-features -p r3_port_std --no-default-features ${{ env.features_param }}
+          args: -p r3_port_std --no-default-features ${{ env.features_param }}
         env:
           RUST_LOG: debug
 

diff --git a/doc/testing.md b/doc/testing.md
@@ -23,23 +23,23 @@ This document explains how to use the test suite and what is needed to do so.
 
 The following table shows how to run the kernel test suite for each target.
 
-|   Architecture  |                  Board                   |                                   Command                                    |
-| --------------- | ---------------------------------------- | ---------------------------------------------------------------------------- |
-| Host            | Host                                     | `cargo test -p r3_port_std -Zpackage-features --features r3_test_suite/full` |
-| Armv7-M+FPU+DSP | [NUCLEO-F401RE]                          | `cargo run -p r3_test_runner -- -t nucleo_f401re`                            |
-| Armv8-MML+FPU   | [Arm MPS2+] [AN505] (QEMU)             | `cargo run -p r3_test_runner -- -t qemu_mps2_an505`                          |
-| Armv8-MML       | Arm MPS2+ AN505 (QEMU)                   | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m33`            |
-| Armv8-MBL       | Arm MPS2+ AN505 (QEMU)                   | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m23`            |
-| Armv7-M         | Arm MPS2+ [AN385] (QEMU)                | `cargo run -p r3_test_runner -- -t qemu_mps2_an385`                          |
-| Armv6-M         | Arm MPS2+ AN385 (QEMU)                   | `cargo run -p r3_test_runner -- -t qemu_mps2_an385 -a cortex_m0`             |
-| Armv7-A         | [GR-PEACH]                               | `cargo run -p r3_test_runner -- -t gr_peach`                                 |
-| Armv7-A         | [Arm RealView PBX for Cortex-A9] (QEMU) | `cargo run -p r3_test_runner -- -t qemu_realview_pbx_a9`                     |
-| RV32IMAC        | [SiFive E] (QEMU)                       | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv32`                       |
-| RV32GC          | [SiFive U] (QEMU)                       | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv32`                       |
-| RV64IMAC        | SiFive E (QEMU)                          | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv64`                       |
-| RV64GC          | SiFive U (QEMU)                          | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv64`                       |
-| RV32IMAC        | [RED-V] (SPI flash XIP)                 | `cargo run -p r3_test_runner -- -t red_v`                                    |
-| RV64GC          | [Maix] boards (UART ISP)                 | `cargo run -p r3_test_runner -- -t maix`                                     |
+|   Architecture  |                  Board                   |                              Command                              |
+| --------------- | ---------------------------------------- | ----------------------------------------------------------------- |
+| Host            | Host                                     | `cargo test -p r3_port_std --features r3_test_suite/full`         |
+| Armv7-M+FPU+DSP | [NUCLEO-F401RE]                          | `cargo run -p r3_test_runner -- -t nucleo_f401re`                 |
+| Armv8-MML+FPU   | [Arm MPS2+] [AN505] (QEMU)             | `cargo run -p r3_test_runner -- -t qemu_mps2_an505`               |
+| Armv8-MML       | Arm MPS2+ AN505 (QEMU)                   | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m33` |
+| Armv8-MBL       | Arm MPS2+ AN505 (QEMU)                   | `cargo run -p r3_test_runner -- -t qemu_mps2_an505 -a cortex_m23` |
+| Armv7-M         | Arm MPS2+ [AN385] (QEMU)                | `cargo run -p r3_test_runner -- -t qemu_mps2_an385`               |
+| Armv6-M         | Arm MPS2+ AN385 (QEMU)                   | `cargo run -p r3_test_runner -- -t qemu_mps2_an385 -a cortex_m0`  |
+| Armv7-A         | [GR-PEACH]                               | `cargo run -p r3_test_runner -- -t gr_peach`                      |
+| Armv7-A         | [Arm RealView PBX for Cortex-A9] (QEMU) | `cargo run -p r3_test_runner -- -t qemu_realview_pbx_a9`          |
+| RV32IMAC        | [SiFive E] (QEMU)                       | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv32`            |
+| RV32GC          | [SiFive U] (QEMU)                       | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv32`            |
+| RV64IMAC        | SiFive E (QEMU)                          | `cargo run -p r3_test_runner -- -t qemu_sifive_e_rv64`            |
+| RV64GC          | SiFive U (QEMU)                          | `cargo run -p r3_test_runner -- -t qemu_sifive_u_rv64`            |
+| RV32IMAC        | [RED-V] (SPI flash XIP)                 | `cargo run -p r3_test_runner -- -t red_v`                         |
+| RV64GC          | [Maix] boards (UART ISP)                 | `cargo run -p r3_test_runner -- -t maix`                          |
 
 [NUCLEO-F401RE]: https://www.st.com/en/evaluation-tools/nucleo-f401re.html
 [Arm MPS2+]: https://developer.arm.com/tools-and-software/development-boards/fpga-prototyping-boards/mps2