From a424eec023a4db685c952bc7ad93dd6dfa48cbf3 Mon Sep 17 00:00:00 2001 From: Jeff Bezanson Date: Tue, 3 May 2016 12:23:52 -0400 Subject: [PATCH] Revert "fix #16153, method sorting of `{Any,}` vs. `{ANY, Any...}`" This reverts commit 61073c348c8698034f80a68fcea4d242a230e634. --- src/jltypes.c | 2 -- test/core.jl | 5 ----- 2 files changed, 7 deletions(-) diff --git a/src/jltypes.c b/src/jltypes.c index a8d5408e9a910..62ee99e91cc65 100644 --- a/src/jltypes.c +++ b/src/jltypes.c @@ -2737,8 +2737,6 @@ static int jl_type_morespecific_(jl_value_t *a, jl_value_t *b, int invariant) } } - if (a == jl_ANY_flag) return 0; - if (jl_is_uniontype(b)) { if (invariant) return 0; diff --git a/test/core.jl b/test/core.jl index bd2e8413a74e7..2ec331b74eea2 100644 --- a/test/core.jl +++ b/test/core.jl @@ -3887,8 +3887,3 @@ function f16158(x) bar(x) end @test f16158("abc") == "abcaba" - -# issue #16153 -f16153(x) = 1 -f16153(x::ANY, y...) = 2 -@test f16153("") == 1