@@ -263,35 +263,32 @@ declaration
263263 -> D.ValidDecl
264264 -> Result.ResultErr D.CanonicalDecl
265265declaration env (A.A (region,_) decl) =
266− let canonicalize kind _context _pattern env v =
267− kind env v
268− in
269266 A.A region <$>
270267 case decl of
271268 D.Definition (Valid.Definition p e t) ->
272269 D.Definition <$> (
273270 Canonical.Definition
274− <$> canonicalize pattern "definition" p env p
271+ <$> pattern env p
275272 <*> expression env e
276− <*> T.traverse (canonicalize Canonicalize.tipe "definition" p env) t
273+ <*> T.traverse (Canonicalize.tipe env) t
277274 )
278275
279276 D.Datatype name tvars ctors ->
280277 D.Datatype name tvars <$> T.traverse canonicalize' ctors
281278 where
282279 canonicalize' (ctor,args) =
283− (,) ctor <$> T.traverse (canonicalize Canonicalize.tipe "datatype" name env) args
280+ (,) ctor <$> T.traverse (Canonicalize.tipe env) args
284281
285282 D.TypeAlias name tvars expanded ->
286283 D.TypeAlias name tvars
287− <$> canonicalize Canonicalize.tipe "type alias" name env expanded
284+ <$> Canonicalize.tipe env expanded
288285
289286 D.Port validPort ->
290287 Result.addModule ["Native","Port"] $
291288 Result.addModule ["Native","Json"] $
292289 case validPort of
293290 D.In name tipe ->
294− canonicalize Canonicalize.tipe "port" name env tipe
291+ Canonicalize.tipe env tipe
295292 `Result.andThen` \canonicalType ->
296293 D.Port <$> Port.check region name Nothing canonicalType
297294
@@ -299,7 +296,7 @@ declaration env (A.A (region,_) decl) =
299296 let exprTypeResult =
300297 (,)
301298 <$> expression env expr
302− <*> canonicalize Canonicalize.tipe "port" name env tipe
299+ <*> Canonicalize.tipe env tipe
303300 in
304301 exprTypeResult
305302 `Result.andThen` \(expr', tipe') ->