Skip to content
Snippets Groups Projects
Commit 7ae2ea2b authored by Jorge Aparicio's avatar Jorge Aparicio
Browse files

drop idle.locals

parent 02c5cb3f
No related branches found
No related tags found
No related merge requests found
...@@ -16,7 +16,6 @@ pub struct App { ...@@ -16,7 +16,6 @@ pub struct App {
} }
pub struct Idle { pub struct Idle {
pub locals: Statics,
pub path: Path, pub path: Path,
pub resources: Idents, pub resources: Idents,
} }
...@@ -59,20 +58,17 @@ fn idents(field: &str, idents: Option<Idents>) -> Result<Idents> { ...@@ -59,20 +58,17 @@ fn idents(field: &str, idents: Option<Idents>) -> Result<Idents> {
fn idle(idle: Option<::Idle>) -> Result<Idle> { fn idle(idle: Option<::Idle>) -> Result<Idle> {
Ok(if let Some(idle) = idle { Ok(if let Some(idle) = idle {
ensure!( ensure!(
idle.locals.is_some() || idle.path.is_some() || idle.path.is_some() || idle.resources.is_some(),
idle.resources.is_some(),
"empty `idle` field. It should be removed." "empty `idle` field. It should be removed."
); );
Idle { Idle {
locals: ::check::statics("locals", idle.locals)?,
path: ::check::path("idle", idle.path) path: ::check::path("idle", idle.path)
.chain_err(|| "checking `path`")?, .chain_err(|| "checking `path`")?,
resources: ::check::idents("resources", idle.resources)?, resources: ::check::idents("resources", idle.resources)?,
} }
} else { } else {
Idle { Idle {
locals: Statics::new(),
path: util::mk_path("idle"), path: util::mk_path("idle"),
resources: Idents::new(), resources: Idents::new(),
} }
......
...@@ -43,7 +43,6 @@ pub struct Init { ...@@ -43,7 +43,6 @@ pub struct Init {
/// `idle` /// `idle`
#[derive(Debug)] #[derive(Debug)]
pub struct Idle { pub struct Idle {
pub locals: Option<Statics>,
pub path: Option<Path>, pub path: Option<Path>,
pub resources: Option<Idents>, pub resources: Option<Idents>,
} }
......
...@@ -164,7 +164,6 @@ fn idents(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idents> { ...@@ -164,7 +164,6 @@ fn idents(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idents> {
fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> { fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> {
::parse::delimited(tts, DelimToken::Brace, |tts| { ::parse::delimited(tts, DelimToken::Brace, |tts| {
let mut locals = None;
let mut path = None; let mut path = None;
let mut resources = None; let mut resources = None;
...@@ -175,13 +174,6 @@ fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> { ...@@ -175,13 +174,6 @@ fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> {
path = Some(::parse::path(tts)?); path = Some(::parse::path(tts)?);
} }
"locals" => {
ensure!(locals.is_none(), "duplicated `locals` field");
locals = Some(
::parse::statics(tts).chain_err(|| "parsing `locals`")?,
);
}
"resources" => { "resources" => {
ensure!( ensure!(
resources.is_none(), resources.is_none(),
...@@ -197,11 +189,7 @@ fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> { ...@@ -197,11 +189,7 @@ fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> {
Ok(()) Ok(())
})?; })?;
Ok(Idle { Ok(Idle { path, resources })
locals,
path,
resources,
})
}) })
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment