diff options
author | Nadrieril | 2019-05-03 23:28:07 +0200 |
---|---|---|
committer | Nadrieril | 2019-05-03 23:28:07 +0200 |
commit | 1337310f0938294bb2c8da9dfdf3d30200c6b9f2 (patch) | |
tree | 0166b98b908a6619e230c55e5da967dc9538a96e /dhall/src/expr.rs | |
parent | a0a240c0bcba01d6420da86c31101578aeeca495 (diff) |
Remove some deprecated functions
Diffstat (limited to 'dhall/src/expr.rs')
-rw-r--r-- | dhall/src/expr.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/dhall/src/expr.rs b/dhall/src/expr.rs index 4d55f4a..9a161bd 100644 --- a/dhall/src/expr.rs +++ b/dhall/src/expr.rs @@ -95,7 +95,7 @@ mod typed { // TODO: Avoid cloning if possible pub(crate) fn to_value(&self) -> Value { match self { - TypedInternal::Value(th, _) => th.normalize_whnf().clone(), + TypedInternal::Value(th, _) => th.to_value(), TypedInternal::Sort => Value::Const(Const::Sort), } } @@ -108,7 +108,7 @@ mod typed { match self { TypedInternal::Value(th, _) => th.clone(), TypedInternal::Sort => { - Thunk::from_whnf(Value::Const(Const::Sort)) + Thunk::from_value(Value::Const(Const::Sort)) } } } @@ -116,7 +116,7 @@ mod typed { pub(crate) fn to_type(&self) -> Type<'static> { match self { TypedInternal::Sort => Type(TypeInternal::Const(Const::Sort)), - TypedInternal::Value(th, _) => match &*th.normalize_whnf() { + TypedInternal::Value(th, _) => match &*th.as_value() { Value::Const(c) => Type(TypeInternal::Const(*c)), _ => Type(TypeInternal::Typed(Box::new(Typed( self.clone(), |