diff options
| -rw-r--r-- | Cargo.lock | 4 | ||||
| -rw-r--r-- | Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall/Cargo.toml | 2 | ||||
| -rw-r--r-- | dhall/src/lib.rs | 2 | ||||
| -rw-r--r-- | dhall/src/normalize.rs | 2 | ||||
| -rw-r--r-- | dhall/src/traits/static_type.rs | 2 | ||||
| -rw-r--r-- | dhall/src/typecheck.rs | 2 | ||||
| -rw-r--r-- | dhall/tests/traits.rs | 16 | ||||
| -rw-r--r-- | dhall_proc_macros/Cargo.toml (renamed from dhall_generator/Cargo.toml) | 2 | ||||
| -rw-r--r-- | dhall_proc_macros/src/derive.rs (renamed from dhall_generator/src/derive.rs) | 0 | ||||
| -rw-r--r-- | dhall_proc_macros/src/lib.rs (renamed from dhall_generator/src/lib.rs) | 0 | ||||
| -rw-r--r-- | dhall_proc_macros/src/quote.rs (renamed from dhall_generator/src/quote.rs) | 0 |
12 files changed, 17 insertions, 17 deletions
@@ -69,7 +69,7 @@ name = "dhall" version = "0.1.0" dependencies = [ "bytecount 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", - "dhall_generator 0.1.0", + "dhall_proc_macros 0.1.0", "dhall_syntax 0.1.0", "improved_slice_patterns 2.0.0", "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -91,7 +91,7 @@ dependencies = [ ] [[package]] -name = "dhall_generator" +name = "dhall_proc_macros" version = "0.1.0" dependencies = [ "dhall_syntax 0.1.0", @@ -6,7 +6,7 @@ members = [ "dhall", "dhall_generated_parser", "dhall_syntax", - "dhall_generator", + "dhall_proc_macros", "improved_slice_patterns", ] diff --git a/dhall/Cargo.toml b/dhall/Cargo.toml index 28123e5..d08627d 100644 --- a/dhall/Cargo.toml +++ b/dhall/Cargo.toml @@ -14,7 +14,7 @@ serde = { version = "1.0", features = ["derive"] } serde_cbor = "0.9.0" improved_slice_patterns = { version = "2.0.0", path = "../improved_slice_patterns" } dhall_syntax = { path = "../dhall_syntax" } -dhall_generator = { path = "../dhall_generator" } +dhall_proc_macros = { path = "../dhall_proc_macros" } [dev-dependencies] pretty_assertions = "0.6.1" diff --git a/dhall/src/lib.rs b/dhall/src/lib.rs index 6e4361f..a531f64 100644 --- a/dhall/src/lib.rs +++ b/dhall/src/lib.rs @@ -140,7 +140,7 @@ mod typecheck; pub mod de { pub use crate::traits::{Deserialize, SimpleStaticType, StaticType}; #[doc(hidden)] - pub use dhall_generator::SimpleStaticType; + pub use dhall_proc_macros::SimpleStaticType; /// Deserialize an instance of type T from a string of Dhall text. /// diff --git a/dhall/src/normalize.rs b/dhall/src/normalize.rs index c64bb4a..c035d93 100644 --- a/dhall/src/normalize.rs +++ b/dhall/src/normalize.rs @@ -7,7 +7,7 @@ use dhall_syntax::{ rc, BinOp, Builtin, Const, ExprF, Integer, InterpolatedText, InterpolatedTextContents, Label, Natural, SubExpr, V, X, }; -use dhall_generator as dhall; +use dhall_proc_macros as dhall; use crate::expr::{Normalized, Type, Typed, TypedInternal}; diff --git a/dhall/src/traits/static_type.rs b/dhall/src/traits/static_type.rs index 6e42da8..60b894c 100644 --- a/dhall/src/traits/static_type.rs +++ b/dhall/src/traits/static_type.rs @@ -1,6 +1,6 @@ use crate::expr::*; use dhall_syntax::*; -use dhall_generator as dhall; +use dhall_proc_macros as dhall; /// A value that has a statically-known Dhall type. /// diff --git a/dhall/src/typecheck.rs b/dhall/src/typecheck.rs index 1683fbf..0b8ea53 100644 --- a/dhall/src/typecheck.rs +++ b/dhall/src/typecheck.rs @@ -10,7 +10,7 @@ use crate::traits::DynamicType; use dhall_syntax; use dhall_syntax::context::Context; use dhall_syntax::*; -use dhall_generator as dhall; +use dhall_proc_macros as dhall; use self::TypeMessage::*; diff --git a/dhall/tests/traits.rs b/dhall/tests/traits.rs index e26a6c7..4b21d42 100644 --- a/dhall/tests/traits.rs +++ b/dhall/tests/traits.rs @@ -1,7 +1,7 @@ #![feature(proc_macro_hygiene)] use dhall::de::SimpleStaticType; use dhall_syntax::{SubExpr, X}; -use dhall_generator; +use dhall_proc_macros; #[test] fn test_static_type() { @@ -11,19 +11,19 @@ fn test_static_type() { assert_eq!( bool::get_simple_static_type(), - mktype(dhall_generator::subexpr!(Bool)) + mktype(dhall_proc_macros::subexpr!(Bool)) ); assert_eq!( String::get_simple_static_type(), - mktype(dhall_generator::subexpr!(Text)) + mktype(dhall_proc_macros::subexpr!(Text)) ); assert_eq!( <Option<bool>>::get_simple_static_type(), - mktype(dhall_generator::subexpr!(Optional Bool)) + mktype(dhall_proc_macros::subexpr!(Optional Bool)) ); assert_eq!( <(bool, Option<String>)>::get_simple_static_type(), - mktype(dhall_generator::subexpr!({ _1: Bool, _2: Optional Text })) + mktype(dhall_proc_macros::subexpr!({ _1: Bool, _2: Optional Text })) ); #[derive(dhall::de::SimpleStaticType)] @@ -35,7 +35,7 @@ fn test_static_type() { assert_eq!( <A as dhall::de::SimpleStaticType>::get_simple_static_type(), mktype( - dhall_generator::subexpr!({ field1: Bool, field2: Optional Bool }) + dhall_proc_macros::subexpr!({ field1: Bool, field2: Optional Bool }) ) ); @@ -63,7 +63,7 @@ fn test_static_type() { struct D(); assert_eq!( <C<D>>::get_simple_static_type(), - mktype(dhall_generator::subexpr!({ _1: {}, _2: Optional Text })) + mktype(dhall_proc_macros::subexpr!({ _1: {}, _2: Optional Text })) ); #[derive(SimpleStaticType)] @@ -74,6 +74,6 @@ fn test_static_type() { }; assert_eq!( <E<bool>>::get_simple_static_type(), - mktype(dhall_generator::subexpr!(< A: Bool | B: Text >)) + mktype(dhall_proc_macros::subexpr!(< A: Bool | B: Text >)) ); } diff --git a/dhall_generator/Cargo.toml b/dhall_proc_macros/Cargo.toml index 8a6b6e2..76a749f 100644 --- a/dhall_generator/Cargo.toml +++ b/dhall_proc_macros/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "dhall_generator" +name = "dhall_proc_macros" version = "0.1.0" authors = ["Nadrieril <nadrieril@users.noreply.github.com>"] license = "BSD-2-Clause" diff --git a/dhall_generator/src/derive.rs b/dhall_proc_macros/src/derive.rs index bcefb17..bcefb17 100644 --- a/dhall_generator/src/derive.rs +++ b/dhall_proc_macros/src/derive.rs diff --git a/dhall_generator/src/lib.rs b/dhall_proc_macros/src/lib.rs index 1124968..1124968 100644 --- a/dhall_generator/src/lib.rs +++ b/dhall_proc_macros/src/lib.rs diff --git a/dhall_generator/src/quote.rs b/dhall_proc_macros/src/quote.rs index c2323fa..c2323fa 100644 --- a/dhall_generator/src/quote.rs +++ b/dhall_proc_macros/src/quote.rs |