allow argcheck(condition, string) again

jw3126 · Dec 6, 2017 · 08ec44e · 08ec44e
1 parent 47b5008
commit 08ec44e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/src/ArgCheck.jl b/src/ArgCheck.jl
@@ -111,9 +111,7 @@ function build_error(code, T::Type{<:Exception}, args...)
     ret 
 end
 function build_error(code, msg::AbstractString)
-    ret = ArgumentError(msg)
-    warn("`@argcheck condition \"$msg\"` is deprecated. Use `@argcheck condition $ret` instead")
-    ret
+    ArgumentError(msg)
 end
 build_error(code, T::Type{<:Exception}=ArgumentError) = T("$code must hold.")
 build_error(code, err::Exception) = err

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -166,11 +166,15 @@ end
     @argcheck issorted(xs...)
 end
 
+@testset "custom message" begin
+    x = 0
+    @test_throws ArgumentError @argcheck x > 1 "this should not happen"
+    @argcheck true "this should not happen"
+end
+
 @testset "deprecate" begin
 
     # deprecate
     err = @catch_exception_object @argcheck false MyExoticError 1 2
     @test err === MyExoticError(1,2)
-    x = 0
-    @test_throws ArgumentError @argcheck x > 1 "this should not happen"
 end