Merge remote-tracking branch 'origin/master' into fintan/canonicalize

1 files changed, 0 insertions, 68 deletions

diff --git a/dhall/tests/traits.rs b/dhall/tests/traits.rs
deleted file mode 100644
index 0f75553..0000000
--- a/dhall/tests/traits.rs
+++ /dev/null
@@ -1,68 +0,0 @@
-#![feature(proc_macro_hygiene)]
-use dhall::de::{from_str, StaticType, Type};
-
-#[test]
-fn test_static_type() {
-    fn parse(s: &str) -> Type {
-        from_str(s, None).unwrap()
-    }
-
-    assert_eq!(bool::static_type(), parse("Bool"));
-    assert_eq!(String::static_type(), parse("Text"));
-    assert_eq!(<Option<bool>>::static_type(), parse("Optional Bool"));
-    assert_eq!(
-        <(bool, Vec<String>)>::static_type(),
-        parse("{ _1: Bool, _2: List Text }")
-    );
-
-    #[derive(dhall::de::StaticType)]
-    #[allow(dead_code)]
-    struct A {
-        field1: bool,
-        field2: Option<bool>,
-    }
-    assert_eq!(
-        <A as dhall::de::StaticType>::static_type(),
-        parse("{ field1: Bool, field2: Optional Bool }")
-    );
-
-    #[derive(StaticType)]
-    #[allow(dead_code)]
-    struct B<'a, T: 'a> {
-        field1: &'a T,
-        field2: Option<T>,
-    }
-    assert_eq!(<B<'static, bool>>::static_type(), A::static_type());
-
-    #[derive(StaticType)]
-    #[allow(dead_code)]
-    struct C<T>(T, Option<String>);
-    assert_eq!(
-        <C<bool>>::static_type(),
-        <(bool, Option<String>)>::static_type()
-    );
-
-    #[derive(StaticType)]
-    #[allow(dead_code)]
-    struct D();
-    assert_eq!(
-        <C<D>>::static_type(),
-        parse("{ _1: {}, _2: Optional Text }")
-    );
-
-    #[derive(StaticType)]
-    #[allow(dead_code)]
-    enum E<T> {
-        A(T),
-        B(String),
-    };
-    assert_eq!(<E<bool>>::static_type(), parse("< A: Bool | B: Text >"));
-
-    #[derive(StaticType)]
-    #[allow(dead_code)]
-    enum F {
-        A,
-        B(bool),
-    };
-    assert_eq!(F::static_type(), parse("< A | B: Bool >"));
-}