mirror/rtic
1
0
Fork 0
mirror of https://github.com/rtic-rs/rtic.git synced 2024-11-23 20:22:51 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove parsing on capacity

Browse source
This commit is contained in:
Emil Fresk 2023-01-27 19:33:25 +01:00 committed by Henrik Tjäder
parent 1baa4a4228
commit d23de62823
2 changed files with 0 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
rtic/macros/src/syntax/analyze.rs
View file

@ -367,9 +367,6 @@ pub type SyncTypes = Set<Box<Type>>;
/// A channel used to send messages /// A channel used to send messages
#[derive(Debug, Default)] #[derive(Debug, Default)]
pub struct Channel { pub struct Channel {
/// The channel capacity
pub capacity: u8,
/// Tasks that can be spawned on this channel /// Tasks that can be spawned on this channel
pub tasks: BTreeSet<Task>, pub tasks: BTreeSet<Task>,
} }

44
rtic/macros/src/syntax/parse.rs
View file

@ -191,7 +191,6 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
} }
let mut binds = None; let mut binds = None;
let mut capacity = None;
let mut priority = None; let mut priority = None;
let mut shared_resources = None; let mut shared_resources = None;
let mut local_resources = None; let mut local_resources = None;
@ -220,55 +219,12 @@ fn task_args(tokens: TokenStream2) -> parse::Result<Either<HardwareTaskArgs, Sof
)); ));
} }
if capacity.is_some() {
return Err(parse::Error::new(
ident.span(),
"hardware tasks can't use the `capacity` argument",
));
}
// Parse identifier name // Parse identifier name
let ident = content.parse()?; let ident = content.parse()?;
binds = Some(ident); binds = Some(ident);
} }
"capacity" => {
if capacity.is_some() {
return Err(parse::Error::new(
ident.span(),
"argument appears more than once",
));
}
if binds.is_some() {
return Err(parse::Error::new(
ident.span(),
"hardware tasks can't use the `capacity` argument",
));
}
// #lit
let lit: LitInt = content.parse()?;
if !lit.suffix().is_empty() {
return Err(parse::Error::new(
lit.span(),
"this literal must be unsuffixed",
));
}
let value = lit.base10_parse::<u8>().ok();
if value.is_none() || value == Some(0) {
return Err(parse::Error::new(
lit.span(),
"this literal must be in the range 1...255",
));
}
capacity = Some(value.unwrap());
}
"priority" => { "priority" => {
if priority.is_some() { if priority.is_some() {
return Err(parse::Error::new( return Err(parse::Error::new(