summaryrefslogtreecommitdiff
path: root/dhall_syntax/src
diff options
context:
space:
mode:
authorNadrieril2019-05-12 19:57:57 +0200
committerNadrieril2019-05-12 19:57:57 +0200
commitaac3a50ec2e7fd31e4264e3c87b9500ad6dc9beb (patch)
tree85dcf63d22085ca8ae449d8902630e5c6aee243d /dhall_syntax/src
parent8abb4843a4d0fd62a70fc704f894b76b52d40c9b (diff)
clippy
Diffstat (limited to 'dhall_syntax/src')
-rw-r--r--dhall_syntax/src/core/context.rs4
-rw-r--r--dhall_syntax/src/core/expr.rs1
-rw-r--r--dhall_syntax/src/parser.rs4
3 files changed, 4 insertions, 5 deletions
diff --git a/dhall_syntax/src/core/context.rs b/dhall_syntax/src/core/context.rs
index 55bfff5..eeec121 100644
--- a/dhall_syntax/src/core/context.rs
+++ b/dhall_syntax/src/core/context.rs
@@ -56,13 +56,13 @@ impl<K: Hash + Eq + Clone, T> Context<K, T> {
self.0.get(k).into_iter().flat_map(|v| v.iter())
}
- pub fn iter<'a>(&'a self) -> impl Iterator<Item = (&K, &T)> {
+ pub fn iter(&self) -> impl Iterator<Item = (&K, &T)> {
self.0
.iter()
.flat_map(|(k, vs)| vs.iter().map(move |v| (k, v)))
}
- pub fn iter_keys<'a>(&'a self) -> impl Iterator<Item = (&K, &Vec<T>)> {
+ pub fn iter_keys(&self) -> impl Iterator<Item = (&K, &Vec<T>)> {
self.0.iter()
}
}
diff --git a/dhall_syntax/src/core/expr.rs b/dhall_syntax/src/core/expr.rs
index f8b0215..69471d5 100644
--- a/dhall_syntax/src/core/expr.rs
+++ b/dhall_syntax/src/core/expr.rs
@@ -1,4 +1,3 @@
-#![allow(non_snake_case)]
use std::rc::Rc;
use crate::map::DupTreeMap;
diff --git a/dhall_syntax/src/parser.rs b/dhall_syntax/src/parser.rs
index 3e461df..316ef2f 100644
--- a/dhall_syntax/src/parser.rs
+++ b/dhall_syntax/src/parser.rs
@@ -431,7 +431,7 @@ make_parser! {
lines
.into_iter()
.intersperse(newline)
- .flat_map(|x| x.into_iter())
+ .flat_map(InterpolatedText::into_iter)
.collect::<ParsedText>()
}
));
@@ -1003,7 +1003,7 @@ make_parser! {
));
}
-pub fn parse_expr<'a>(s: &'a str) -> ParseResult<ParsedSubExpr> {
+pub fn parse_expr(s: &str) -> ParseResult<ParsedSubExpr> {
let mut pairs = DhallParser::parse(Rule::final_expression, s)?;
let rc_input = s.to_string().into();
let expr = do_parse(rc_input, pairs.next().unwrap())?;