3 files changed, 18 insertions, 16 deletions
diff --git a/src/type/check.rs b/src/type/check.rs
index 91ca422..e536ce7 100644
--- a/src/type/check.rs
+++ b/src/type/check.rs
@@ -163,11 +163,7 @@ impl SExp {
     /// };
     /// ```
     pub fn type_check(&self) -> Result<Type, TypeError> {
-        let ty = self.infer_type(HashMap::new())?;
-        match ty.is_concrete() {
-            Ok(()) => Ok(ty),
-            Err(s) => Err(UnboundGeneric(ty, s)),
-        }
+        self.infer_type(HashMap::new())
     }
 
 
@@ -198,7 +194,6 @@ impl SExp {
                                 List(vec![VecType, vecof(vt("T"))])
                             )),
             Atom(Let)    => Ok(LetType),
-            Atom(Print)  => Ok(arr(vt("_"), arr(vt("T"), vt("T")))),
 
 
             SCons(op, l) => {
@@ -303,11 +298,10 @@ impl Type {
                     restype = restype.subst(&name, &ty);
                 }
 
-                //match restype.is_concrete() {
-                //    Ok(()) => Ok(arr(argtype.clone(), restype)),
-                //    Err(unbound) => Err(UnboundGeneric(unbound)),
-                //}
-                Ok(arr(argtype.clone(), restype))
+                match restype.is_concrete() {
+                    Ok(()) => Ok(arr(argtype.clone(), restype)),
+                    Err(unbound) => Err(UnboundGeneric(unbound)),
+                }
             },
             _ => Err(OtherError)
         }
@@ -385,6 +379,14 @@ mod tests {
     use super::{*, TypeError};
 
     #[test]
+    fn test_failing_infer_generics() {
+        assert_eq!(
+            arr(Integer, VarType("X".to_string())).infer_generics(&Integer),
+            Err(TypeError::UnboundGeneric(String::from("X")))
+        );
+    }
+
+    #[test]
     fn test_infer_generics() {
 
         // Simple identity function, really all we
diff --git a/src/type/display.rs b/src/type/display.rs
index f859dc3..4a9b54a 100644
--- a/src/type/display.rs
+++ b/src/type/display.rs
@@ -67,8 +67,8 @@ impl fmt::Display for TypeError {
     ///     "invalid argument list: '(1 2 3)'\nexpected: '(Int Int)'\nfound: '(Int Int Int)'".to_string()
     /// );
     /// assert_eq!(
-    ///     UnboundGeneric(arr(Integer, vt("?")), String::from("?")).to_string(),
-    ///     "unbound generic type in '(Int -> ?)': '?'".to_string()
+    ///     UnboundGeneric(String::from("?")).to_string(),
+    ///     "unbound generic type: '?'".to_string()
     /// );
     /// assert_eq!(
     ///     ArgumentsDontMatchGeneric {
@@ -80,8 +80,8 @@ impl fmt::Display for TypeError {
     /// ```
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         match self {
-            UndefinedVariable(name)  => write!(f, "undefined variable: '{}'", name),
-            UnboundGeneric(ty, name) => write!(f, "unbound generic type in '{}': '{}'", ty, name),
+            UndefinedVariable(name) => write!(f, "undefined variable: '{}'", name),
+            UnboundGeneric(name)    => write!(f, "unbound generic type: '{}'", name),
             InvalidOperator { operator, expected, found } => {
                 write!(
                     f,
diff --git a/src/type/mod.rs b/src/type/mod.rs
index 6f5c6dc..afb5a0b 100644
--- a/src/type/mod.rs
+++ b/src/type/mod.rs
@@ -40,7 +40,7 @@ pub enum TypeError {
 
     UndefinedVariable(String),
 
-    UnboundGeneric(Type, String),
+    UnboundGeneric(String),
 
     InvalidOperator {
 	operator: SExp,