NaxdyOrg/embassy
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update to 2021 edition. (#820)

Browse source
This commit is contained in:
Dario Nieuwenhuis 2022-06-18 02:15:48 +02:00 committed by GitHub
parent b585d54712
commit 88e36a70bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
43 changed files with 51 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
embassy-boot/boot/Cargo.toml
View file

@ -2,7 +2,7 @@
authors = [
"Ulf Lilleengen <lulf@redhat.com>",
]
edition = "2018"
edition = "2021"
name = "embassy-boot"
version = "0.1.0"
description = "Bootloader using Embassy"

2
embassy-boot/nrf/Cargo.toml
View file

@ -2,7 +2,7 @@
authors = [
"Ulf Lilleengen <lulf@redhat.com>",
]
edition = "2018"
edition = "2021"
name = "embassy-boot-nrf"
version = "0.1.0"
description = "Bootloader for nRF chips"

3
embassy-cortex-m/Cargo.toml
View file

@ -2,8 +2,7 @@
name = "embassy-cortex-m"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
resolver = "2"
edition = "2021"
[package.metadata.embassy_docs]
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-cortex-m-v$VERSION/embassy-cortex-m/src/"

2
embassy-embedded-hal/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-embedded-hal"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
[features]
std = []

2
embassy-hal-common/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-hal-common"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
[features]

2
embassy-lora/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-lora"
version = "0.1.0"
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
[package.metadata.embassy_docs]
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-lora-v$VERSION/embassy-lora/src/"

2
embassy-macros/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-macros"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
[dependencies]
syn = { version = "1.0.76", features = ["full", "extra-traits"] }

2
embassy-net/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-net"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
[package.metadata.embassy_docs]

2
embassy-nrf/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-nrf"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
[package.metadata.embassy_docs]
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-nrf-v$VERSION/embassy-nrf/src/"

2
embassy-rp/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "embassy-rp"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
[package.metadata.embassy_docs]
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-rp-v$VERSION/embassy-rp/src/"

5
embassy-stm32/Cargo.toml
View file

@ -2,8 +2,7 @@
name = "embassy-stm32"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
resolver = "2"
edition = "2021"
[package.metadata.embassy_docs]
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-stm32-v$VERSION/embassy-stm32/src/"
@ -63,7 +62,7 @@ vcell = "0.1.3"
bxcan = "0.6.2"
nb = "1.0.0"
stm32-fmc = "0.2.4"
seq-macro = "0.2.2"
seq-macro = "0.3.0"
cfg-if = "1.0.0"
embedded-io = { version = "0.3.0", features = ["async"], optional = true }

6
embassy-stm32/src/rcc/l4.rs
View file

@ -102,7 +102,7 @@ seq_macro::seq!(N in 8..=86 {
#[derive(Clone, Copy)]
pub enum PLLMul {
#(
Mul#N,
Mul~N,
)*
}
@ -110,7 +110,7 @@ seq_macro::seq!(N in 8..=86 {
fn from(val: PLLMul) -> u8 {
match val {
#(
PLLMul::Mul#N => N,
PLLMul::Mul~N => N,
)*
}
}
@ -120,7 +120,7 @@ seq_macro::seq!(N in 8..=86 {
pub fn to_mul(self) -> u32 {
match self {
#(
PLLMul::Mul#N => N,
PLLMul::Mul~N => N,
)*
}
}

6
embassy-stm32/src/rcc/l5.rs
View file

@ -104,7 +104,7 @@ seq_macro::seq!(N in 8..=86 {
#[derive(Clone, Copy)]
pub enum PLLMul {
#(
Mul#N,
Mul~N,
)*
}
@ -112,7 +112,7 @@ seq_macro::seq!(N in 8..=86 {
fn from(val: PLLMul) -> u8 {
match val {
#(
PLLMul::Mul#N => N,
PLLMul::Mul~N => N,
)*
}
}
@ -122,7 +122,7 @@ seq_macro::seq!(N in 8..=86 {
pub fn to_mul(self) -> u32 {
match self {
#(
PLLMul::Mul#N => N,
PLLMul::Mul~N => N,
)*
}
}

8
embassy-stm32/src/rcc/u5.rs
View file

@ -51,7 +51,7 @@ seq_macro::seq!(N in 2..=128 {
pub enum PllClkDiv {
NotDivided,
#(
Div#N = (N-1),
Div~N = (N-1),
)*
}
@ -60,7 +60,7 @@ seq_macro::seq!(N in 2..=128 {
match self {
PllClkDiv::NotDivided => 1,
#(
PllClkDiv::Div#N => (N + 1),
PllClkDiv::Div~N => (N + 1),
)*
}
}
@ -78,7 +78,7 @@ seq_macro::seq!(N in 4..=512 {
pub enum PllN {
NotMultiplied,
#(
Mul#N = (N-1),
Mul~N = (N-1),
)*
}
@ -87,7 +87,7 @@ seq_macro::seq!(N in 4..=512 {
match self {
PllN::NotMultiplied => 1,
#(
PllN::Mul#N => (N + 1),
PllN::Mul~N => (N + 1),
)*
}
}

3
embassy/Cargo.toml
View file

@ -2,8 +2,7 @@
name = "embassy"
version = "0.1.0"
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
resolver = "2"
edition = "2021"
[package.metadata.embassy_docs]
src_base = "https://github.com/embassy-rs/embassy/blob/embassy-v$VERSION/embassy/src/"

2
examples/boot/nrf/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
name = "embassy-boot-nrf-examples"
version = "0.1.0"

2
examples/boot/stm32l0/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
name = "embassy-boot-stm32l0-examples"
version = "0.1.0"

2
examples/boot/stm32l1/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
name = "embassy-boot-stm32l1-examples"
version = "0.1.0"

2
examples/boot/stm32l4/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
name = "embassy-boot-stm32l4-examples"
version = "0.1.0"

2
examples/boot/stm32wl/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
name = "embassy-boot-stm32wl-examples"
version = "0.1.0"

2
examples/std/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-std-examples"
version = "0.1.0"

3
examples/stm32f0/Cargo.toml
View file

@ -2,8 +2,7 @@
name = "embassy-stm32f0-examples"
version = "0.1.0"
authors = ["Thales Fragoso <thales.fragosoz@gmail.com>"]
edition = "2018"
resolver = "2"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

3
examples/stm32f1/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32f1-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32f2/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32f2-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32f3/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32f3-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32f4/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32f4-examples"
version = "0.1.0"
resolver = "2"
[dependencies]

3
examples/stm32f7/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32f7-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32g0/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>", "Ben Gamari <ben@smart-cactus.org>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32g0-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32g4/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>", "Ben Gamari <ben@smart-cactus.org>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32g4-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32h7/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32h7-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "unstable-traits", "time-tick-32768hz"] }

3
examples/stm32l0/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>", "Ulf Lilleengen <ulf.lilleengen@gmail.com>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32l0-examples"
version = "0.1.0"
resolver = "2"
[features]
default = ["nightly"]

3
examples/stm32l1/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>", "Ulf Lilleengen <ulf.lilleengen@gmail.com>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32l1-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32l4/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32l4-examples"
version = "0.1.0"
resolver = "2"
[features]

3
examples/stm32l5/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32l5-examples"
version = "0.1.0"
resolver = "2"
[features]

3
examples/stm32u5/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32u5-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32wb/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32wb-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

3
examples/stm32wl/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>", "Ulf Lilleengen <ulf.lilleengen@gmail.com>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32wl-examples"
version = "0.1.0"
resolver = "2"
[dependencies]
embassy = { version = "0.1.0", path = "../../embassy", features = ["defmt", "defmt-timestamp-uptime", "time-tick-32768hz"] }

2
examples/wasm/Cargo.toml
View file

@ -1,6 +1,6 @@
[package]
authors = ["Ulf Lilleengen <lulf@redhat.com>"]
edition = "2018"
edition = "2021"
name = "embassy-wasm-example"
version = "0.1.0"

2
stm32-gen-features/Cargo.toml
View file

@ -2,7 +2,7 @@
name = "gen_features"
version = "0.1.0"
authors = ["Côme ALLART <come.allart@netc.fr>"]
edition = "2018"
edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

2
stm32-metapac-gen/Cargo.toml
View file

@ -1,7 +1,7 @@
[package]
name = "stm32-metapac-gen"
version = "0.1.0"
edition = "2018"
edition = "2021"
[dependencies]

3
stm32-metapac/Cargo.toml
View file

@ -1,8 +1,7 @@
[package]
name = "stm32-metapac"
version = "0.1.0"
edition = "2018"
resolver = "2"
edition = "2021"
license = "MIT OR Apache-2.0"
repository = "https://github.com/embassy-rs/embassy"
description = "Peripheral Access Crate (PAC) for all STM32 chips, including metadata."

3
tests/stm32/Cargo.toml
View file

@ -1,9 +1,8 @@
[package]
authors = ["Dario Nieuwenhuis <dirbaio@dirbaio.net>"]
edition = "2018"
edition = "2021"
name = "embassy-stm32-tests"
version = "0.1.0"
resolver = "2"
[features]
stm32f103c8 = ["embassy-stm32/stm32f103c8"] # Blue Pill

2
xtask/Cargo.toml
View file

@ -3,7 +3,7 @@ authors = [
"Ulf Lilleengen <lulf@redhat.com>",
"Bob McWhirter <bmcwhirt@redhat.com>"
]
edition = "2018"
edition = "2021"
name = "xtask"
version = "0.1.0"