From 929a34c177f8b18ae791f77bbd4630a862fb1070 Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 15 Dec 2019 19:42:57 +0000 Subject: Reexport dhall_syntax as a module in dhall --- serde_dhall/src/lib.rs | 2 +- serde_dhall/src/serde.rs | 2 +- serde_dhall/src/static_type.rs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'serde_dhall') diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs index d371d6d..91b47e5 100644 --- a/serde_dhall/src/lib.rs +++ b/serde_dhall/src/lib.rs @@ -123,7 +123,7 @@ pub use value::Value; // A Dhall value. pub mod value { use dhall::phase::{NormalizedExpr, Parsed, Typed}; - use dhall_syntax::Builtin; + use dhall::syntax::Builtin; use super::de::{Error, Result}; diff --git a/serde_dhall/src/serde.rs b/serde_dhall/src/serde.rs index 26708c1..2972ea2 100644 --- a/serde_dhall/src/serde.rs +++ b/serde_dhall/src/serde.rs @@ -1,7 +1,7 @@ use std::borrow::Cow; use dhall::phase::NormalizedExpr; -use dhall_syntax::ExprF; +use dhall::syntax::ExprF; use crate::de::{Deserialize, Error, Result}; use crate::Value; diff --git a/serde_dhall/src/static_type.rs b/serde_dhall/src/static_type.rs index 67a7bc4..1323aa3 100644 --- a/serde_dhall/src/static_type.rs +++ b/serde_dhall/src/static_type.rs @@ -1,4 +1,4 @@ -use dhall_syntax::{Builtin, Integer, Natural}; +use dhall::syntax::{Builtin, Integer, Natural}; use crate::Value; -- cgit v1.3.1 From b11a2cd6ca50d5a4dfa71ae8cd0642fb1c75e1cf Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Sun, 15 Dec 2019 20:01:35 +0000 Subject: Refer to semantics module properly --- dhall/src/lib.rs | 2 -- dhall/src/semantics/core/context.rs | 8 ++++---- dhall/src/semantics/core/value.rs | 14 +++++++------- dhall/src/semantics/core/valuef.rs | 8 ++++---- dhall/src/semantics/error/mod.rs | 8 ++++---- dhall/src/semantics/phase/binary.rs | 4 ++-- dhall/src/semantics/phase/mod.rs | 8 ++++---- dhall/src/semantics/phase/normalize.rs | 8 ++++---- dhall/src/semantics/phase/parse.rs | 8 ++++---- dhall/src/semantics/phase/resolve.rs | 4 ++-- dhall/src/semantics/phase/typecheck.rs | 14 +++++++------- dhall/src/tests.rs | 4 ++-- serde_dhall/src/lib.rs | 6 +++--- serde_dhall/src/serde.rs | 2 +- 14 files changed, 48 insertions(+), 50 deletions(-) (limited to 'serde_dhall') diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs index 3c0159a..86af98f 100644 --- a/dhall/src/lib.rs +++ b/dhall/src/lib.rs @@ -13,8 +13,6 @@ mod tests; pub mod semantics; -pub use crate::semantics::*; - pub mod syntax { pub use dhall_syntax::*; } diff --git a/dhall/src/semantics/core/context.rs b/dhall/src/semantics/core/context.rs index c3da823..d150e56 100644 --- a/dhall/src/semantics/core/context.rs +++ b/dhall/src/semantics/core/context.rs @@ -1,10 +1,10 @@ use std::collections::HashMap; use std::rc::Rc; -use crate::core::value::Value; -use crate::core::valuef::ValueF; -use crate::core::var::{AlphaVar, Shift, Subst}; -use crate::error::TypeError; +use crate::semantics::core::value::Value; +use crate::semantics::core::valuef::ValueF; +use crate::semantics::core::var::{AlphaVar, Shift, Subst}; +use crate::semantics::error::TypeError; use crate::syntax::{Label, V}; #[derive(Debug, Clone)] diff --git a/dhall/src/semantics/core/value.rs b/dhall/src/semantics/core/value.rs index 68b879b..6e6739f 100644 --- a/dhall/src/semantics/core/value.rs +++ b/dhall/src/semantics/core/value.rs @@ -1,13 +1,13 @@ use std::cell::{Ref, RefCell, RefMut}; use std::rc::Rc; -use crate::core::context::TypecheckContext; -use crate::core::valuef::ValueF; -use crate::core::var::{AlphaVar, Shift, Subst}; -use crate::error::{TypeError, TypeMessage}; -use crate::phase::normalize::{apply_any, normalize_whnf}; -use crate::phase::typecheck::{builtin_to_value, const_to_value}; -use crate::phase::{NormalizedExpr, Typed}; +use crate::semantics::core::context::TypecheckContext; +use crate::semantics::core::valuef::ValueF; +use crate::semantics::core::var::{AlphaVar, Shift, Subst}; +use crate::semantics::error::{TypeError, TypeMessage}; +use crate::semantics::phase::normalize::{apply_any, normalize_whnf}; +use crate::semantics::phase::typecheck::{builtin_to_value, const_to_value}; +use crate::semantics::phase::{NormalizedExpr, Typed}; use crate::syntax::{Builtin, Const, Span}; #[derive(Debug, Clone, Copy)] diff --git a/dhall/src/semantics/core/valuef.rs b/dhall/src/semantics/core/valuef.rs index e11d5d7..73c715a 100644 --- a/dhall/src/semantics/core/valuef.rs +++ b/dhall/src/semantics/core/valuef.rs @@ -1,9 +1,9 @@ use std::collections::HashMap; -use crate::core::value::{ToExprOptions, Value}; -use crate::core::var::{AlphaLabel, AlphaVar, Shift, Subst}; -use crate::phase::typecheck::rc; -use crate::phase::{Normalized, NormalizedExpr}; +use crate::semantics::core::value::{ToExprOptions, Value}; +use crate::semantics::core::var::{AlphaLabel, AlphaVar, Shift, Subst}; +use crate::semantics::phase::typecheck::rc; +use crate::semantics::phase::{Normalized, NormalizedExpr}; use crate::syntax; use crate::syntax::{ Builtin, Const, ExprF, Integer, InterpolatedTextContents, Label, diff --git a/dhall/src/semantics/error/mod.rs b/dhall/src/semantics/error/mod.rs index b2f799d..1288c12 100644 --- a/dhall/src/semantics/error/mod.rs +++ b/dhall/src/semantics/error/mod.rs @@ -1,9 +1,9 @@ use std::io::Error as IOError; -use crate::core::context::TypecheckContext; -use crate::core::value::Value; -use crate::phase::resolve::ImportStack; -use crate::phase::NormalizedExpr; +use crate::semantics::core::context::TypecheckContext; +use crate::semantics::core::value::Value; +use crate::semantics::phase::resolve::ImportStack; +use crate::semantics::phase::NormalizedExpr; use crate::syntax::{BinOp, Import, Label, ParseError, Span}; pub type Result = std::result::Result; diff --git a/dhall/src/semantics/phase/binary.rs b/dhall/src/semantics/phase/binary.rs index a38f08a..9fe31ad 100644 --- a/dhall/src/semantics/phase/binary.rs +++ b/dhall/src/semantics/phase/binary.rs @@ -3,8 +3,8 @@ use serde_cbor::value::value as cbor; use std::iter::FromIterator; use std::vec; -use crate::error::{DecodeError, EncodeError}; -use crate::phase::DecodedExpr; +use crate::semantics::error::{DecodeError, EncodeError}; +use crate::semantics::phase::DecodedExpr; use crate::syntax; use crate::syntax::map::DupTreeMap; use crate::syntax::{ diff --git a/dhall/src/semantics/phase/mod.rs b/dhall/src/semantics/phase/mod.rs index 9f38308..0d8fc75 100644 --- a/dhall/src/semantics/phase/mod.rs +++ b/dhall/src/semantics/phase/mod.rs @@ -1,10 +1,10 @@ use std::fmt::Display; use std::path::Path; -use crate::core::value::{ToExprOptions, Value}; -use crate::core::valuef::ValueF; -use crate::core::var::{AlphaVar, Shift, Subst}; -use crate::error::{EncodeError, Error, ImportError, TypeError}; +use crate::semantics::core::value::{ToExprOptions, Value}; +use crate::semantics::core::valuef::ValueF; +use crate::semantics::core::var::{AlphaVar, Shift, Subst}; +use crate::semantics::error::{EncodeError, Error, ImportError, TypeError}; use crate::syntax::{Builtin, Const, Expr}; use resolve::ImportRoot; diff --git a/dhall/src/semantics/phase/normalize.rs b/dhall/src/semantics/phase/normalize.rs index 59531bd..81c3ce1 100644 --- a/dhall/src/semantics/phase/normalize.rs +++ b/dhall/src/semantics/phase/normalize.rs @@ -1,9 +1,9 @@ use std::collections::HashMap; -use crate::core::value::Value; -use crate::core::valuef::ValueF; -use crate::core::var::{AlphaLabel, AlphaVar, Shift, Subst}; -use crate::phase::Normalized; +use crate::semantics::core::value::Value; +use crate::semantics::core::valuef::ValueF; +use crate::semantics::core::var::{AlphaLabel, AlphaVar, Shift, Subst}; +use crate::semantics::phase::Normalized; use crate::syntax; use crate::syntax::Const::Type; use crate::syntax::{ diff --git a/dhall/src/semantics/phase/parse.rs b/dhall/src/semantics/phase/parse.rs index 601e93d..6e8e8bd 100644 --- a/dhall/src/semantics/phase/parse.rs +++ b/dhall/src/semantics/phase/parse.rs @@ -2,10 +2,10 @@ use std::fs::File; use std::io::Read; use std::path::Path; -use crate::error::Error; -use crate::phase::binary; -use crate::phase::resolve::ImportRoot; -use crate::phase::Parsed; +use crate::semantics::error::Error; +use crate::semantics::phase::binary; +use crate::semantics::phase::resolve::ImportRoot; +use crate::semantics::phase::Parsed; use crate::syntax::parse_expr; pub(crate) fn parse_file(f: &Path) -> Result { diff --git a/dhall/src/semantics/phase/resolve.rs b/dhall/src/semantics/phase/resolve.rs index d0563c0..86dc7ae 100644 --- a/dhall/src/semantics/phase/resolve.rs +++ b/dhall/src/semantics/phase/resolve.rs @@ -1,8 +1,8 @@ use std::collections::HashMap; use std::path::{Path, PathBuf}; -use crate::error::{Error, ImportError}; -use crate::phase::{Normalized, NormalizedExpr, Parsed, Resolved}; +use crate::semantics::error::{Error, ImportError}; +use crate::semantics::phase::{Normalized, NormalizedExpr, Parsed, Resolved}; use crate::syntax; use crate::syntax::{FilePath, ImportLocation, URL}; diff --git a/dhall/src/semantics/phase/typecheck.rs b/dhall/src/semantics/phase/typecheck.rs index cc524c4..59380a3 100644 --- a/dhall/src/semantics/phase/typecheck.rs +++ b/dhall/src/semantics/phase/typecheck.rs @@ -1,13 +1,13 @@ use std::cmp::max; use std::collections::HashMap; -use crate::core::context::TypecheckContext; -use crate::core::value::Value; -use crate::core::valuef::ValueF; -use crate::core::var::{Shift, Subst}; -use crate::error::{TypeError, TypeMessage}; -use crate::phase::normalize::merge_maps; -use crate::phase::Normalized; +use crate::semantics::core::context::TypecheckContext; +use crate::semantics::core::value::Value; +use crate::semantics::core::valuef::ValueF; +use crate::semantics::core::var::{Shift, Subst}; +use crate::semantics::error::{TypeError, TypeMessage}; +use crate::semantics::phase::normalize::merge_maps; +use crate::semantics::phase::Normalized; use crate::syntax; use crate::syntax::{ Builtin, Const, Expr, ExprF, InterpolatedTextContents, Label, RawExpr, Span, diff --git a/dhall/src/tests.rs b/dhall/src/tests.rs index 1037ef9..9e5c744 100644 --- a/dhall/src/tests.rs +++ b/dhall/src/tests.rs @@ -47,8 +47,8 @@ use std::fs::File; use std::io::{Read, Write}; use std::path::PathBuf; -use crate::error::{Error, Result}; -use crate::phase::Parsed; +use crate::semantics::error::{Error, Result}; +use crate::semantics::phase::Parsed; #[allow(dead_code)] #[derive(Clone)] diff --git a/serde_dhall/src/lib.rs b/serde_dhall/src/lib.rs index 91b47e5..80ebaf8 100644 --- a/serde_dhall/src/lib.rs +++ b/serde_dhall/src/lib.rs @@ -122,7 +122,7 @@ pub use value::Value; // A Dhall value. pub mod value { - use dhall::phase::{NormalizedExpr, Parsed, Typed}; + use dhall::semantics::phase::{NormalizedExpr, Parsed, Typed}; use dhall::syntax::Builtin; use super::de::{Error, Result}; @@ -138,7 +138,7 @@ pub mod value { fn from_str_using_dhall_error_type( s: &str, ty: Option<&Value>, - ) -> dhall::error::Result { + ) -> dhall::semantics::error::Result { 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::error::Error as DhallError; + use dhall::semantics::error::Error as DhallError; pub type Result = std::result::Result; diff --git a/serde_dhall/src/serde.rs b/serde_dhall/src/serde.rs index 2972ea2..9006a08 100644 --- a/serde_dhall/src/serde.rs +++ b/serde_dhall/src/serde.rs @@ -1,6 +1,6 @@ use std::borrow::Cow; -use dhall::phase::NormalizedExpr; +use dhall::semantics::phase::NormalizedExpr; use dhall::syntax::ExprF; use crate::de::{Deserialize, Error, Result}; -- cgit v1.3.1 From 27b054b0465d106fb4b6ba4d6dec16288cbc4e1d Mon Sep 17 00:00:00 2001 From: Nadrieril Date: Tue, 17 Dec 2019 11:45:18 +0000 Subject: Remove dhall_syntax crate --- Cargo.lock | 16 ---------------- Cargo.toml | 12 ------------ dhall_syntax/Cargo.toml | 23 ----------------------- dhall_syntax/src/lib.rs | 1 - serde_dhall/Cargo.toml | 1 - 5 files changed, 53 deletions(-) delete mode 100644 dhall_syntax/Cargo.toml delete mode 100644 dhall_syntax/src/lib.rs (limited to 'serde_dhall') diff --git a/Cargo.lock b/Cargo.lock index 555577a..b196894 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -101,21 +101,6 @@ dependencies = [ "syn 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", ] -[[package]] -name = "dhall_syntax" -version = "0.1.0" -dependencies = [ - "abnf_to_pest 0.1.1", - "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)", - "hex 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "percent-encoding 2.1.0 (registry+https://github.com/rust-lang/crates.io-index)", - "pest 2.1.2 (registry+https://github.com/rust-lang/crates.io-index)", - "pest_consume 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)", - "take_mut 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)", -] - [[package]] name = "difference" version = "2.0.0" @@ -373,7 +358,6 @@ version = "0.1.0" dependencies = [ "dhall 0.1.0", "dhall_proc_macros 0.1.0", - "dhall_syntax 0.1.0", "serde 1.0.99 (registry+https://github.com/rust-lang/crates.io-index)", ] diff --git a/Cargo.toml b/Cargo.toml index b603e21..fc1f68d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -4,19 +4,7 @@ cargo-features = ["profile-overrides"] members = [ "abnf_to_pest", "dhall", - "dhall_syntax", "dhall_proc_macros", "improved_slice_patterns", "serde_dhall" ] - -# # Parser is super slow when not optimized -# [profile.dev.overrides.dhall_parser] -# opt-level = 3 -# [profile.dev.overrides.dhall_syntax] -# opt-level = 3 -# [profile.dev.overrides.dhall] -# opt-level = 3 -# [profile.dev] -# opt-level = 3 - diff --git a/dhall_syntax/Cargo.toml b/dhall_syntax/Cargo.toml deleted file mode 100644 index e4dd533..0000000 --- a/dhall_syntax/Cargo.toml +++ /dev/null @@ -1,23 +0,0 @@ -[package] -name = "dhall_syntax" -version = "0.1.0" -authors = ["NanoTech ", "Nadrieril "] -license = "BSD-2-Clause" -edition = "2018" - -[lib] -doctest = false - -[build-dependencies] -abnf_to_pest = { version = "0.1.1", path = "../abnf_to_pest" } - -[dependencies] -itertools = "0.8.0" -percent-encoding = "2.1.0" -pest = "2.1" -either = "1.5.2" -take_mut = "0.2.2" -hex = "0.3.2" -lazy_static = "1.4.0" -# pest_consume = { path = "../../pest_consume/pest_consume" } -pest_consume = "1.0" diff --git a/dhall_syntax/src/lib.rs b/dhall_syntax/src/lib.rs deleted file mode 100644 index 8b13789..0000000 --- a/dhall_syntax/src/lib.rs +++ /dev/null @@ -1 +0,0 @@ - diff --git a/serde_dhall/Cargo.toml b/serde_dhall/Cargo.toml index c61ddcd..9d46822 100644 --- a/serde_dhall/Cargo.toml +++ b/serde_dhall/Cargo.toml @@ -8,5 +8,4 @@ edition = "2018" [dependencies] serde = { version = "1.0", features = ["derive"] } dhall = { path = "../dhall" } -dhall_syntax = { path = "../dhall_syntax" } dhall_proc_macros = { path = "../dhall_proc_macros" } -- cgit v1.3.1