diff options
| author | Nadrieril Feneanar | 2019-12-20 19:39:16 +0000 |
|---|---|---|
| committer | GitHub | 2019-12-20 19:39:16 +0000 |
| commit | de0dd59204e979e29445d634a0739394110261ef (patch) | |
| tree | a75ce010c7ea771a03cb51cc2b828dad6ea1a9f7 /serde_dhall | |
| parent | 91ef0cf697d56c91a8d15937aa4669dc221cd6c1 (diff) | |
| parent | 64cca1837cc97b7679c4e2ffd54a22ad50f05cfd (diff) | |
Merge pull request #118 from Nadrieril/clarify-types
Clarify naming and file organization
Diffstat (limited to 'serde_dhall')
| -rw-r--r-- | serde_dhall/src/lib.rs | 4 | ||||
| -rw-r--r-- | serde_dhall/src/serde.rs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs index 80ebaf8..2863788 100644 --- a/serde_dhall/src/lib.rs +++ b/serde_dhall/src/lib.rs @@ -138,7 +138,7 @@ pub mod value { fn from_str_using_dhall_error_type( s: &str, ty: Option<&Value>, - ) -> dhall::semantics::error::Result<Self> { + ) -> dhall::error::Result<Self> { let resolved = Parsed::parse_str(s)?.resolve()?; let typed = match ty { None => resolved.typecheck()?, @@ -193,7 +193,7 @@ pub mod de { pub use error::{Error, Result}; mod error { - use dhall::semantics::error::Error as DhallError; + use dhall::error::Error as DhallError; pub type Result<T> = std::result::Result<T, Error>; diff --git a/serde_dhall/src/serde.rs b/serde_dhall/src/serde.rs index 9006a08..cf5efc4 100644 --- a/serde_dhall/src/serde.rs +++ b/serde_dhall/src/serde.rs @@ -1,7 +1,7 @@ use std::borrow::Cow; use dhall::semantics::phase::NormalizedExpr; -use dhall::syntax::ExprF; +use dhall::syntax::ExprKind; use crate::de::{Deserialize, Error, Result}; use crate::Value; @@ -31,7 +31,7 @@ impl<'de: 'a, 'a> serde::Deserializer<'de> for Deserializer<'a> { V: serde::de::Visitor<'de>, { use std::convert::TryInto; - use ExprF::*; + use ExprKind::*; match self.0.as_ref().as_ref() { NaturalLit(n) => { if let Ok(n64) = (*n).try_into() { |