Remove obsolete code

mapbox · Jul 18, 2017 · 2d82f1a · 2d82f1a
1 parent 0a56210
commit 2d82f1a
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 9 deletions.
diff --git a/src/style-spec/function/definitions/curve.js b/src/style-spec/function/definitions/curve.js
@@ -79,10 +79,7 @@ class CurveExpression extends CompoundExpression {
             error: `Expected at least four arguments, but found only ${compiledArgs.length}.`
         }];
 
-        let firstOutputType = this.args[3].type;
-        if (firstOutputType.kind === 'lambda') {
-            firstOutputType = firstOutputType.result;
-        }
+        const firstOutputType = this.args[3].type;
         let resultType;
         if (firstOutputType === NumberType) {
             resultType = 'number';

diff --git a/src/style-spec/function/types.js b/src/style-spec/function/types.js
@@ -40,12 +40,8 @@ function isGeneric(type: Type, stack: Array<Type> = []) {
         return true;
     } else if (type.kind === 'array') {
         return isGeneric(type.itemType, stack.concat(type));
-    } else if (type.kind === 'variant') {
-        return type.members.some((t) => isGeneric(t, stack.concat(type)));
     } else if (type.kind === 'nargs') {
         return type.types.some((t) => isGeneric(t, stack.concat(type)));
-    } else if (type.kind === 'lambda') {
-        return isGeneric(type.result) || type.params.some((t) => isGeneric(t, stack.concat(type)));
     }
     return false;
 }
@@ -65,7 +61,6 @@ function match(
     typenames: { [string]: Type } = {},
     scope: 'expected' | 'actual' = 'expected'
 ) {
-    if (t.kind === 'lambda') t = t.result;
     const errorMessage = `Expected ${expected.name} but found ${t.name} instead.`;
 
     if (expected.kind === 'typename') {