diff options
author | Nadrieril | 2019-08-27 22:58:20 +0200 |
---|---|---|
committer | Nadrieril | 2019-08-27 22:58:57 +0200 |
commit | a981afc465f4279a7a4d6ce3ac5844e04846613b (patch) | |
tree | fb548f87f2c6e5be73d0fc44ca49f44b6de80dba /dhall_syntax/src/core | |
parent | 7d11bebc8f2047bb5a26f7f52ae0bd1f60bb6367 (diff) |
clippy
Diffstat (limited to 'dhall_syntax/src/core')
-rw-r--r-- | dhall_syntax/src/core/expr.rs | 2 | ||||
-rw-r--r-- | dhall_syntax/src/core/import.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/dhall_syntax/src/core/expr.rs b/dhall_syntax/src/core/expr.rs index efbcee2..32166a6 100644 --- a/dhall_syntax/src/core/expr.rs +++ b/dhall_syntax/src/core/expr.rs @@ -331,7 +331,7 @@ impl<E> Expr<E> { ExprF::BinOp(BinOp::ImportAlt, l, r) => l .as_ref() .traverse_resolve_with_visitor(visitor) - .or(r.as_ref().traverse_resolve_with_visitor(visitor)), + .or_else(|_| r.as_ref().traverse_resolve_with_visitor(visitor)), _ => { let e = self.visit(&mut *visitor)?; Ok(match &e { diff --git a/dhall_syntax/src/core/import.rs b/dhall_syntax/src/core/import.rs index 9329d48..d1f3fca 100644 --- a/dhall_syntax/src/core/import.rs +++ b/dhall_syntax/src/core/import.rs @@ -79,7 +79,7 @@ impl<SE> ImportLocation<SE> { ) -> Result<ImportLocation<SE2>, Err> { use ImportLocation::*; Ok(match self { - Local(prefix, path) => Local(prefix.clone(), path.clone()), + Local(prefix, path) => Local(*prefix, path.clone()), Remote(url) => Remote(url.visit_subexpr(f)?), Env(env) => Env(env.clone()), Missing => Missing, |