From 8842c33abe2fa16140f4b3d919dbfea2281c976b Mon Sep 17 00:00:00 2001 From: Taiki Endo Date: Thu, 16 Jan 2025 23:28:54 +0900 Subject: [PATCH] tests: Update git dependencies --- Cargo.toml | 4 ++-- bench/Cargo.toml | 4 ++-- tests/avr/Cargo.toml | 3 +-- tests/avr/src/main.rs | 3 +++ tests/msp430/Cargo.toml | 2 +- tests/no-std-qemu/Cargo.toml | 2 +- tests/xtensa/Cargo.toml | 4 ++-- tests/xtensa/src/main.rs | 2 +- 8 files changed, 13 insertions(+), 11 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 38ef22c0..f0cf1cdf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -83,13 +83,13 @@ serde = { version = "1.0.60", optional = true, default-features = false } critical-section = { version = "1", optional = true } [dev-dependencies] -test-helper = { git = "https://github.com/taiki-e/test-helper.git", branch = "main", features = ["std", "sys", "cpuinfo", "critical-section"] } +test-helper = { features = ["std", "sys", "cpuinfo", "critical-section"], git = "https://github.com/taiki-e/test-helper.git", branch = "main" } build-context = "0.1" crossbeam-utils = "=0.8.16" # The latest crossbeam-utils requires Rust 1.60 fastrand = "2" paste = "1" -quickcheck = { default-features = false, git = "https://github.com/taiki-e/quickcheck.git", branch = "dev" } # https://github.com/BurntSushi/quickcheck/pull/304 + https://github.com/BurntSushi/quickcheck/pull/282 + https://github.com/BurntSushi/quickcheck/pull/296 + lower MSRV +quickcheck = { version = "1", default-features = false, git = "https://github.com/taiki-e/quickcheck.git", branch = "dev" } # https://github.com/BurntSushi/quickcheck/pull/304 + https://github.com/BurntSushi/quickcheck/pull/282 + https://github.com/BurntSushi/quickcheck/pull/296 + f16/f128 support + lower MSRV serde_test = { git = "https://github.com/taiki-e/serde_test.git", branch = "dev" } # support {i,u}128 sptr = "0.3" static_assertions = "1" diff --git a/bench/Cargo.toml b/bench/Cargo.toml index e819bc7b..2cf19e39 100644 --- a/bench/Cargo.toml +++ b/bench/Cargo.toml @@ -11,7 +11,7 @@ fallback = [] std = [] [dev-dependencies] -test-helper = { git = "https://github.com/taiki-e/test-helper.git", branch = "main", features = ["std", "sys", "cpuinfo", "critical-section"] } +test-helper = { features = ["std", "sys", "cpuinfo", "critical-section"], git = "https://github.com/taiki-e/test-helper.git", branch = "main" } # atomic = "0.6" build-context = "0.1" @@ -19,7 +19,7 @@ criterion = { default-features = false, git = "https://github.com/taiki-e/criter crossbeam-utils = "0.8" fastrand = "2" paste = "1" -quickcheck = { default-features = false, git = "https://github.com/taiki-e/quickcheck.git", branch = "dev" } # https://github.com/BurntSushi/quickcheck/pull/304 + https://github.com/BurntSushi/quickcheck/pull/282 + https://github.com/BurntSushi/quickcheck/pull/296 + lower MSRV +quickcheck = { version = "1", default-features = false, git = "https://github.com/taiki-e/quickcheck.git", branch = "dev" } # https://github.com/BurntSushi/quickcheck/pull/304 + https://github.com/BurntSushi/quickcheck/pull/282 + https://github.com/BurntSushi/quickcheck/pull/296 + f16/f128 support + lower MSRV static_assertions = "1" [target.'cfg(unix)'.dev-dependencies] diff --git a/tests/avr/Cargo.toml b/tests/avr/Cargo.toml index c6d7bc67..9cddf392 100644 --- a/tests/avr/Cargo.toml +++ b/tests/avr/Cargo.toml @@ -7,12 +7,11 @@ publish = false [dependencies] portable-atomic = { path = "../..", features = ["float"] } -avr-device = "0.7" paste = "1" ufmt = "0.2" [target.avr-unknown-gnu-atmega2560.dependencies] -arduino-hal = { git = "https://github.com/taiki-e/avr-hal.git", branch = "dev", features = ["arduino-mega2560"] } +arduino-hal = { features = ["arduino-mega2560"], git = "https://github.com/taiki-e/avr-hal.git", branch = "dev" } [workspace] resolver = "2" diff --git a/tests/avr/src/main.rs b/tests/avr/src/main.rs index fffa4073..fccf033a 100644 --- a/tests/avr/src/main.rs +++ b/tests/avr/src/main.rs @@ -8,6 +8,7 @@ #[path = "../../api-test/src/helper.rs"] mod helper; +use arduino_hal::avr_device; use portable_atomic::*; #[avr_device::entry] @@ -126,6 +127,8 @@ fn panic(info: &core::panic::PanicInfo<'_>) -> ! { mod sim { use core::fmt; + use arduino_hal::avr_device; + pub fn exit(_code: u32) -> ! { // Note that there is no way to exit simavr with a non-zero exit code. // https://github.com/buserror/simavr/issues/362 diff --git a/tests/msp430/Cargo.toml b/tests/msp430/Cargo.toml index 6652ebdd..a795a5ed 100644 --- a/tests/msp430/Cargo.toml +++ b/tests/msp430/Cargo.toml @@ -28,7 +28,7 @@ f64 = ["portable-atomic/float"] portable-atomic = { path = "../.." } msp430-rt = "0.4" -msp430f5529 = { git = "https://github.com/cr1901/msp430f5529", rev = "23946ef9bb0365caabd2c30ad14c2c9ab2d425c7", features = ["rt"] } +msp430f5529 = { features = ["rt"], git = "https://github.com/cr1901/msp430f5529.git", rev = "23946ef9bb0365caabd2c30ad14c2c9ab2d425c7" } paste = "1" ufmt = "0.2" diff --git a/tests/no-std-qemu/Cargo.toml b/tests/no-std-qemu/Cargo.toml index 704f82a5..a22e1d86 100644 --- a/tests/no-std-qemu/Cargo.toml +++ b/tests/no-std-qemu/Cargo.toml @@ -9,7 +9,7 @@ portable-atomic = { path = "../..", features = ["float"] } paste = "1" semihosting = { version = "0.1", features = ["stdio", "panic-handler"] } -semihosting-no-std-test-rt = { git = "https://github.com/taiki-e/semihosting.git", rev = "3874a1e8a4904c04a1c0e1f32cab11e2b303aba6", features = ["qemu-system"] } +semihosting-no-std-test-rt = { features = ["qemu-system"], git = "https://github.com/taiki-e/semihosting.git", rev = "3874a1e8a4904c04a1c0e1f32cab11e2b303aba6" } [workspace] resolver = "2" diff --git a/tests/xtensa/Cargo.toml b/tests/xtensa/Cargo.toml index 68f1f9bd..8bcc3f6a 100644 --- a/tests/xtensa/Cargo.toml +++ b/tests/xtensa/Cargo.toml @@ -10,8 +10,8 @@ portable-atomic = { path = "../..", features = ["float"] } paste = "1" [target.xtensa-esp32s2-none-elf.dependencies] -esp-println = { version = "0.12", default-features = false, features = ["uart", "esp32s2"] } -esp-hal = { git = "https://github.com/taiki-e/esp-hal.git", branch = "dev", features = ["esp32s2"] } +esp-println = { default-features = false, features = ["uart", "esp32s2"], git = "https://github.com/taiki-e/esp-hal.git", branch = "dev" } +esp-hal = { features = ["esp32s2"], git = "https://github.com/taiki-e/esp-hal.git", branch = "dev" } [workspace] resolver = "2" diff --git a/tests/xtensa/src/main.rs b/tests/xtensa/src/main.rs index e169dfa5..1d6ac21d 100644 --- a/tests/xtensa/src/main.rs +++ b/tests/xtensa/src/main.rs @@ -11,7 +11,7 @@ mod helper; use esp_println::{print, println}; use portable_atomic::*; -#[esp_hal::entry] +#[esp_hal::main] fn main() -> ! { macro_rules! test_atomic_int { ($int_type:ident) => {