From f7adce853315cfd1e9f473bced8a904c9d155b0e Mon Sep 17 00:00:00 2001 From: Jonathan 'theJPster' Pallant Date: Sat, 17 Aug 2024 12:44:47 +0100 Subject: [PATCH] Reformat all Cargo.toml files Keys are now sorted, and all one-liners. --- on-target-tests/Cargo.toml | 65 ++++++++++++++-------------------- rp2040-hal-examples/Cargo.toml | 26 +++++++------- rp2040-hal-macros/Cargo.toml | 14 +++----- rp2040-hal/Cargo.toml | 45 +++++++++++++---------- 4 files changed, 70 insertions(+), 80 deletions(-) diff --git a/on-target-tests/Cargo.toml b/on-target-tests/Cargo.toml index 2352d9872..02c51a1c6 100644 --- a/on-target-tests/Cargo.toml +++ b/on-target-tests/Cargo.toml @@ -1,82 +1,69 @@ [package] +authors = ["The rp-rs Developers"] +description = "Test cases that run on an RP2040" edition = "2021" +license = "MIT OR Apache-2.0" name = "on-target-tests" -version = "0.1.0" publish = false +readme = "README.md" +repository = "https://github.com/rp-rs/rp-hal" +version = "0.1.0" [[test]] -name = "dma_m2m_u8" harness = false +name = "dma_m2m_u8" [[test]] -name = "dma_m2m_u16" harness = false +name = "dma_m2m_u16" [[test]] -name = "dma_m2m_u32" harness = false +name = "dma_m2m_u32" [[test]] -name = "dma_spi_loopback_u8" harness = false +name = "dma_spi_loopback_u8" [[test]] -name = "dma_spi_loopback_u16" harness = false +name = "dma_spi_loopback_u16" [[test]] -name = "dma_dyn" harness = false +name = "dma_dyn" [[test]] -name = "i2c_loopback" harness = false +name = "i2c_loopback" [[test]] -name = "i2c_loopback_async" harness = false +name = "i2c_loopback_async" [[test]] -name = "gpio" harness = false +name = "gpio" [dependencies] cortex-m = "0.7" cortex-m-rt = "0.7" -embedded_hal_0_2 = { package = "embedded-hal", version = "0.2.5", features = [ - "unproven", -] } -embedded-hal = "1.0.0" -embedded-hal-async = "1.0.0" - +critical-section = "1.0.0" defmt = "0.3" defmt-rtt = "0.4" defmt-test = "0.3.1" -panic-probe = { version = "0.3", features = ["print-defmt"] } - -rp2040-hal = { path = "../rp2040-hal", features = [ - "critical-section-impl", - "defmt", - "rt", - "i2c-write-iter", -] } -# Needed to set spi frequencies +embedded-hal = "1.0.0" +embedded-hal-async = "1.0.0" +embedded_hal_0_2 = {package = "embedded-hal", version = "0.2.5", features = ["unproven"]} fugit = "0.3.6" - +futures = {version = "0.3.30", default-features = false, features = ["async-await"]} +heapless = {version = "0.8.0", features = ["portable-atomic-critical-section", "defmt-03"]} +i2c-write-iter = {version = "1.0.0", features = ["async"]} +itertools = {version = "0.12.0", default-features = false} +nostd_async = {version = "0.6.1", features = ["wfe"]} +panic-probe = {version = "0.3", features = ["print-defmt"]} rp2040-boot2 = "0.3.0" -critical-section = "1.0.0" -heapless = { version = "0.8.0", features = [ - "portable-atomic-critical-section", - "defmt-03", -] } -# - `wfe`: we may want to signal between cores with sev -# - `wfe` implies `cortex-m` -nostd_async = { version = "0.6.1", features = ["wfe"] } -futures = { version = "0.3.30", default-features = false, features = [ - "async-await", -] } -i2c-write-iter = { version = "1.0.0", features = ["async"] } -itertools = { version = "0.12.0", default-features = false } +rp2040-hal = {path = "../rp2040-hal", features = ["critical-section-impl", "defmt", "rt", "i2c-write-iter"]} [profile.dev] codegen-units = 1 diff --git a/rp2040-hal-examples/Cargo.toml b/rp2040-hal-examples/Cargo.toml index 495dd16e6..7956ab7ac 100644 --- a/rp2040-hal-examples/Cargo.toml +++ b/rp2040-hal-examples/Cargo.toml @@ -1,36 +1,36 @@ [package] -name = "rp2040-hal-examples" -version = "0.1.0" -edition = "2021" authors = ["The rp-rs Developers"] -homepage = "https://github.com/rp-rs/rp-hal" +categories = ["embedded", "hardware-support", "no-std", "no-std::no-alloc"] description = "Examples for the rp2040-hal crate" +edition = "2021" +homepage = "https://github.com/rp-rs/rp-hal" +keywords = ["embedded", "hal", "raspberry-pi", "rp2040", "embedded-hal"] license = "MIT OR Apache-2.0" -rust-version = "1.77" +name = "rp2040-hal-examples" repository = "https://github.com/rp-rs/rp-hal" -categories = ["embedded", "hardware-support", "no-std", "no-std::no-alloc"] -keywords = ["embedded", "hal", "raspberry-pi", "rp2040", "embedded-hal"] +rust-version = "1.77" +version = "0.1.0" [dependencies] cortex-m = "0.7.2" cortex-m-rt = "0.7" cortex-m-rtic = "1.1.4" -critical-section = { version = "1.0.0" } +critical-section = {version = "1.0.0"} defmt = "0.3" defmt-rtt = "0.4.0" dht-sensor = "0.2.1" -embedded_hal_0_2 = { package = "embedded-hal", version = "0.2.5", features = ["unproven"] } embedded-alloc = "0.5.1" embedded-hal = "1.0.0" embedded-hal-async = "1.0.0" +embedded_hal_0_2 = {package = "embedded-hal", version = "0.2.5", features = ["unproven"]} fugit = "0.3.6" -futures = { version = "0.3.30", default-features = false, features = ["async-await"] } +futures = {version = "0.3.30", default-features = false, features = ["async-await"]} hd44780-driver = "0.4.0" nb = "1.0" -nostd_async = { version = "0.6.1", features = ["cortex_m"] } +nostd_async = {version = "0.6.1", features = ["cortex_m"]} panic-halt = "0.2.0" -panic-probe = { version = "0.3.1", features = ["print-defmt"] } +panic-probe = {version = "0.3.1", features = ["print-defmt"]} pio = "0.2.0" pio-proc = "0.2.0" rp2040-boot2 = "0.3.0" -rp2040-hal = { path = "../rp2040-hal", version = "0.10.0", features = ["binary-info", "critical-section-impl", "rt", "defmt"] } +rp2040-hal = {path = "../rp2040-hal", version = "0.10.0", features = ["binary-info", "critical-section-impl", "rt", "defmt"]} diff --git a/rp2040-hal-macros/Cargo.toml b/rp2040-hal-macros/Cargo.toml index f95327504..f55c4784b 100644 --- a/rp2040-hal-macros/Cargo.toml +++ b/rp2040-hal-macros/Cargo.toml @@ -1,21 +1,17 @@ [package] +authors = ["The rp-rs Developers"] description = "Macros used by rp2040-hal" +edition = "2021" license = "MIT OR Apache-2.0" name = "rp2040-hal-macros" readme = "README.md" -version = "0.1.0" -edition = "2021" repository = "https://github.com/rp-rs/rp-hal" -authors = ["The rp-rs Developers"] +version = "0.1.0" [lib] proc-macro = true [dependencies] -quote = "1.0" proc-macro2 = "1.0" - -[dependencies.syn] -features = ["full"] -version = "2.0" - +quote = "1.0" +syn = {version = "2.0", features = ["full"]} diff --git a/rp2040-hal/Cargo.toml b/rp2040-hal/Cargo.toml index bcf0bd8b7..d847a6b60 100644 --- a/rp2040-hal/Cargo.toml +++ b/rp2040-hal/Cargo.toml @@ -1,15 +1,15 @@ [package] -name = "rp2040-hal" -version = "0.10.0" authors = ["The rp-rs Developers"] +categories = ["embedded", "hardware-support", "no-std", "no-std::no-alloc"] +description = "A Rust Embedded-HAL impl for the rp2040 microcontroller" edition = "2021" homepage = "https://github.com/rp-rs/rp-hal" -description = "A Rust Embedded-HAL impl for the rp2040 microcontroller" +keywords = ["embedded", "hal", "raspberry-pi", "rp2040", "embedded-hal"] license = "MIT OR Apache-2.0" -rust-version = "1.77" +name = "rp2040-hal" repository = "https://github.com/rp-rs/rp-hal" -categories = ["embedded", "hardware-support", "no-std", "no-std::no-alloc"] -keywords = ["embedded", "hal", "raspberry-pi", "rp2040", "embedded-hal"] +rust-version = "1.77" +version = "0.10.0" [package.metadata.docs.rs] features = ["rt", "rom-v2-intrinsics", "defmt", "rtic-monotonic"] @@ -18,35 +18,42 @@ targets = ["thumbv6m-none-eabi"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -bitfield = { version = "0.14.0" } -chrono = { version = "0.4", default-features = false, optional = true } +# Non-optional dependencies. Keep these sorted by name. +bitfield = {version = "0.14.0"} cortex-m = "0.7.2" -critical-section = { version = "1.0.0" } -defmt = { version = ">=0.2.0, <0.4", optional = true } -embedded_hal_0_2 = { package = "embedded-hal", version = "0.2.5", features = ["unproven"] } +critical-section = {version = "1.0.0"} embedded-dma = "0.2.0" embedded-hal = "1.0.0" embedded-hal-async = "1.0.0" embedded-hal-nb = "1.0.0" embedded-io = "0.6.1" -frunk = { version = "0.4.1", default-features = false } +embedded_hal_0_2 = {package = "embedded-hal", version = "0.2.5", features = ["unproven"]} +frunk = {version = "0.4.1", default-features = false} fugit = "0.3.6" -i2c-write-iter = { version = "1.0.0", features = ["async"], optional = true } -itertools = { version = "0.10.1", default-features = false } +itertools = {version = "0.10.1", default-features = false} nb = "1.0" paste = "1.0" pio = "0.2.0" rand_core = "0.6.3" -rp2040-hal-macros = { version = "0.1.0", path = "../rp2040-hal-macros" } -rp2040-pac = { version = "0.6.0", features = ["critical-section"] } -rtic-monotonic = { version = "1.0.0", optional = true } +rp2040-hal-macros = {version = "0.1.0", path = "../rp2040-hal-macros"} +rp2040-pac = {version = "0.6.0", features = ["critical-section"]} usb-device = "0.3" vcell = "0.1" -void = { version = "1.0.2", default-features = false } +void = {version = "1.0.2", default-features = false} + +# Optional dependencies. Keep these sorted by name. +chrono = {version = "0.4", default-features = false, optional = true} +defmt = {version = ">=0.2.0, <0.4", optional = true} +i2c-write-iter = {version = "1.0.0", features = ["async"], optional = true} +rtic-monotonic = {version = "1.0.0", optional = true} [dev-dependencies] +# Non-optional dependencies. Keep these sorted by name. pio-proc = "0.2.0" -rand = { version = "0.8.5", default-features = false } +rand = {version = "0.8.5", default-features = false} + +# Optional dependencies. Keep these sorted by name. +# None [features] # Minimal startup / runtime for Cortex-M microcontrollers