diff options
| author | Nadrieril Feneanar | 2019-12-19 21:33:26 +0000 |
|---|---|---|
| committer | GitHub | 2019-12-19 21:33:26 +0000 |
| commit | 91ef0cf697d56c91a8d15937aa4669dc221cd6c1 (patch) | |
| tree | d3f00cf31d4386b82c6fb09eda3f690415dd8902 /dhall/src/syntax/core/expr.rs | |
| parent | 3f00e4ca3fe22f88a1d0633e254df0bff781c6d3 (diff) | |
| parent | 1e4f15d1891b497ecf6632432bc9252dc6a4507d (diff) | |
Merge pull request #117 from Nadrieril/merge-crates
Merge a bunch of sub-crates
Diffstat (limited to '')
| -rw-r--r-- | dhall/src/syntax/core/expr.rs (renamed from dhall_syntax/src/core/expr.rs) | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/dhall_syntax/src/core/expr.rs b/dhall/src/syntax/core/expr.rs index 131f97e..5b9f401 100644 --- a/dhall_syntax/src/core/expr.rs +++ b/dhall/src/syntax/core/expr.rs @@ -1,6 +1,6 @@ -use crate::map::{DupTreeMap, DupTreeSet}; -use crate::visitor::{self, ExprFMutVisitor, ExprFVisitor}; -use crate::*; +use crate::syntax::map::{DupTreeMap, DupTreeSet}; +use crate::syntax::visitor::{self, ExprFMutVisitor, ExprFVisitor}; +use crate::syntax::*; pub type Integer = isize; pub type Natural = usize; @@ -351,7 +351,7 @@ impl<E> Expr<E> { } /// Add an isize to an usize -/// Panics on over/underflow +/// Returns `None` on over/underflow fn add_ui(u: usize, i: isize) -> Option<usize> { Some(if i < 0 { u.checked_sub(i.checked_neg()? as usize)? |