diff options
| -rw-r--r-- | Cargo.lock | 16 | ||||
| -rw-r--r-- | dhall/Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall/src/lib.rs | 4 | ||||
| -rw-r--r-- | dhall/src/main.rs | 1 | ||||
| -rw-r--r-- | dhall/src/normalize.rs (renamed from dhall_normalize/src/normalize.rs) | 0 | ||||
| -rw-r--r-- | dhall/src/typecheck.rs | 2 | ||||
| -rw-r--r-- | dhall/tests/macros.rs | 1 | ||||
| -rw-r--r-- | dhall_normalize/Cargo.toml | 18 | ||||
| -rw-r--r-- | dhall_normalize/src/lib.rs | 6 |
9 files changed, 7 insertions, 43 deletions
@@ -136,7 +136,7 @@ version = "0.1.0" dependencies = [ "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "dhall_core 0.1.0", - "dhall_normalize 0.1.0", + "dhall_generator 0.1.0", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", "term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", @@ -167,20 +167,6 @@ dependencies = [ ] [[package]] -name = "dhall_normalize" -version = "0.1.0" -dependencies = [ - "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "dhall_core 0.1.0", - "dhall_generator 0.1.0", - "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "lalrpop-util 0.16.3 (registry+https://github.com/rust-lang/crates.io-index)", - "nom 3.2.1 (registry+https://github.com/rust-lang/crates.io-index)", - "pest 2.1.0 (git+https://github.com/pest-parser/pest)", - "term-painter 0.2.4 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] name = "dhall_parser" version = "0.1.0" dependencies = [ diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml index 2505570..c303ac3 100644 --- a/dhall/Cargo.toml +++ b/dhall/Cargo.toml @@ -13,4 +13,4 @@ itertools = "0.8.0" lalrpop-util = "0.16.3" term-painter = "0.2.3" dhall_core = { path = "../dhall_core" } -dhall_normalize = { path = "../dhall_normalize" } +dhall_generator = { path = "../dhall_generator" } diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs index 32662cd..58b29a3 100644 --- a/dhall/src/lib.rs +++ b/dhall/src/lib.rs @@ -1,4 +1,8 @@ #![feature(box_patterns)] #![feature(trace_macros)] +#![feature(proc_macro_hygiene)] +mod normalize; +pub use crate::normalize::*; pub mod typecheck; + diff --git a/dhall/src/main.rs b/dhall/src/main.rs index 182f4a7..3e8aca4 100644 --- a/dhall/src/main.rs +++ b/dhall/src/main.rs @@ -4,7 +4,6 @@ use term_painter::ToStyle; use dhall::*; use dhall_core::*; -use dhall_normalize::*; const ERROR_STYLE: term_painter::Color = term_painter::Color::Red; const BOLD: term_painter::Attr = term_painter::Attr::Bold; diff --git a/dhall_normalize/src/normalize.rs b/dhall/src/normalize.rs index ec594da..ec594da 100644 --- a/dhall_normalize/src/normalize.rs +++ b/dhall/src/normalize.rs diff --git a/dhall/src/typecheck.rs b/dhall/src/typecheck.rs index 8cab0ac..befd8c4 100644 --- a/dhall/src/typecheck.rs +++ b/dhall/src/typecheck.rs @@ -3,6 +3,7 @@ use std::collections::BTreeMap; use std::collections::HashSet; use std::fmt; +use crate::normalize; use dhall_core::context::Context; use dhall_core::core; use dhall_core::core::Builtin::*; @@ -10,7 +11,6 @@ use dhall_core::core::Const::*; use dhall_core::core::Expr::*; use dhall_core::core::{app, pi}; use dhall_core::core::{bx, shift, subst, Expr, V, X}; -use dhall_normalize::normalize; use self::TypeMessage::*; diff --git a/dhall/tests/macros.rs b/dhall/tests/macros.rs index 7c9d458..777a2f6 100644 --- a/dhall/tests/macros.rs +++ b/dhall/tests/macros.rs @@ -92,7 +92,6 @@ macro_rules! make_spec_test { fn $name() { use dhall::*; use dhall_core::*; - use dhall_normalize::*; use std::thread; thread::Builder::new() diff --git a/dhall_normalize/Cargo.toml b/dhall_normalize/Cargo.toml deleted file mode 100644 index ad1cc0d..0000000 --- a/dhall_normalize/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "dhall_normalize" -version = "0.1.0" -authors = ["NanoTech <nanotech@nanotechcorp.net>", "Nadrieril <nadrieril@users.noreply.github.com>"] -edition = "2018" - -[lib] -doctest = false - -[dependencies] -bytecount = "0.5.1" -itertools = "0.8.0" -lalrpop-util = "0.16.3" -nom = "3.0.0" -term-painter = "0.2.3" -pest = { git = "https://github.com/pest-parser/pest" } -dhall_core = { path = "../dhall_core" } -dhall_generator = { path = "../dhall_generator" } diff --git a/dhall_normalize/src/lib.rs b/dhall_normalize/src/lib.rs deleted file mode 100644 index df49146..0000000 --- a/dhall_normalize/src/lib.rs +++ /dev/null @@ -1,6 +0,0 @@ -#![feature(box_patterns)] -#![feature(trace_macros)] -#![feature(proc_macro_hygiene)] - -mod normalize; -pub use crate::normalize::*; |