From e75f5664694fe5bc282b64f9719a843d85f69253 Mon Sep 17 00:00:00 2001 From: terurou Date: Thu, 17 Jan 2019 18:01:05 +0900 Subject: [PATCH] Fix Maybe. --- haxelib.json | 4 ++-- src/extype/Maybe.hx | 2 +- test/extype/MaybeSuite.hx | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/haxelib.json b/haxelib.json index fbfa5e3..c473b94 100644 --- a/haxelib.json +++ b/haxelib.json @@ -4,9 +4,9 @@ "license": "Apache", "tags": ["haxe", "extern", "type"], "description": "Enhanced standard types for Haxe", - "version": "1.0.1", + "version": "1.0.2", "classPath": "src/", - "releasenote": "Fix Tuple2-10.", + "releasenote": "Fix Maybe.", "contributors": ["denkiyagi"], "dependencies": {} } \ No newline at end of file diff --git a/src/extype/Maybe.hx b/src/extype/Maybe.hx index cbb6485..a89f8f1 100644 --- a/src/extype/Maybe.hx +++ b/src/extype/Maybe.hx @@ -11,7 +11,7 @@ abstract Maybe(Null) { } @:from - @:extern public static inline function from(x: Null): Maybe { + @:extern public static inline function ofNullable(x: Null): Maybe { #if js return new Maybe((x == null) ? null : x); #else diff --git a/test/extype/MaybeSuite.hx b/test/extype/MaybeSuite.hx index 66192c1..ec667cb 100644 --- a/test/extype/MaybeSuite.hx +++ b/test/extype/MaybeSuite.hx @@ -44,14 +44,14 @@ class MaybeSuite extends BuddySuite { }); }); - describe("Maybe.from()", { + describe("Maybe.ofNullable()", { it("can convert value", { - Maybe.from(1).get().should.be(1); + Maybe.ofNullable(1).get().should.be(1); }); it("can convert null", { - Maybe.from(null).isEmpty().should.be(true); + Maybe.ofNullable(null).isEmpty().should.be(true); #if js - Maybe.from(js.Lib.undefined).isEmpty().should.be(true); + Maybe.ofNullable(js.Lib.undefined).isEmpty().should.be(true); #end }); });