Update to 2021 edition. (#820)

This commit is contained in:
Dario Nieuwenhuis
2022-06-18 02:15:48 +02:00
committed by GitHub
parent b585d54712
commit 88e36a70bd
43 changed files with 51 additions and 72 deletions

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 }

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,
)*
}
}

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,
)*
}
}

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),
)*
}
}