From 7ae2ea2bbcc7dac2c5d3ade197f24bd97bf3c29c Mon Sep 17 00:00:00 2001
From: Jorge Aparicio <jorge@japaric.io>
Date: Sun, 23 Jul 2017 20:00:28 -0500
Subject: [PATCH] drop idle.locals
---
src/check.rs | 6 +-----
src/lib.rs | 1 -
src/parse.rs | 14 +-------------
3 files changed, 2 insertions(+), 19 deletions(-)
diff --git a/src/check.rs b/src/check.rs
index 95bc8b8..0e69131 100644
--- a/src/check.rs
+++ b/src/check.rs
@@ -16,7 +16,6 @@ pub struct App {
}
pub struct Idle {
- pub locals: Statics,
pub path: Path,
pub resources: Idents,
}
@@ -59,20 +58,17 @@ fn idents(field: &str, idents: Option<Idents>) -> Result<Idents> {
fn idle(idle: Option<::Idle>) -> Result<Idle> {
Ok(if let Some(idle) = idle {
ensure!(
- idle.locals.is_some() || idle.path.is_some() ||
- idle.resources.is_some(),
+ idle.path.is_some() || idle.resources.is_some(),
"empty `idle` field. It should be removed."
);
Idle {
- locals: ::check::statics("locals", idle.locals)?,
path: ::check::path("idle", idle.path)
.chain_err(|| "checking `path`")?,
resources: ::check::idents("resources", idle.resources)?,
}
} else {
Idle {
- locals: Statics::new(),
path: util::mk_path("idle"),
resources: Idents::new(),
}
diff --git a/src/lib.rs b/src/lib.rs
index 4abe151..d7e38ff 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -43,7 +43,6 @@ pub struct Init {
/// `idle`
#[derive(Debug)]
pub struct Idle {
- pub locals: Option<Statics>,
pub path: Option<Path>,
pub resources: Option<Idents>,
}
diff --git a/src/parse.rs b/src/parse.rs
index 34eccd4..31381ef 100644
--- a/src/parse.rs
+++ b/src/parse.rs
@@ -164,7 +164,6 @@ fn idents(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idents> {
fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> {
::parse::delimited(tts, DelimToken::Brace, |tts| {
- let mut locals = None;
let mut path = None;
let mut resources = None;
@@ -175,13 +174,6 @@ fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> {
path = Some(::parse::path(tts)?);
}
- "locals" => {
- ensure!(locals.is_none(), "duplicated `locals` field");
-
- locals = Some(
- ::parse::statics(tts).chain_err(|| "parsing `locals`")?,
- );
- }
"resources" => {
ensure!(
resources.is_none(),
@@ -197,11 +189,7 @@ fn idle(tts: &mut Peekable<Iter<TokenTree>>) -> Result<Idle> {
Ok(())
})?;
- Ok(Idle {
- locals,
- path,
- resources,
- })
+ Ok(Idle { path, resources })
})
}
--
GitLab