Merge pull request #41 from yuyichao/0.7

Fix depwarns on 0.7
JuliaLang · Sep 13, 2017 · e5f8a5c · e5f8a5c
2 parents d44d9d8 + cbe5481
commit e5f8a5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/SHA.jl b/src/SHA.jl
@@ -45,7 +45,7 @@ for (f, ctx) in [(:sha1, :SHA1_CTX),
         end
 
         # AbstractStrings are a pretty handy thing to be able to crunch through
-        $f(str::AbstractString) = $f(convert(Array{UInt8,1}, str))
+        $f(str::AbstractString) = $f(Vector{UInt8}(str))
 
         # Convenience function for IO devices, allows for things like:
         # open("test.txt") do f

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -199,8 +199,11 @@ for sha_idx in 1:length(sha_funcs)
 end
 println("Done! [$(nerrors - nerrors_old) errors]")
 
-if VERSION >= v"0.5.0-pre+5599" replstr(x) = sprint((io, x) -> show(IOContext(io, limit=true), MIME("text/plain"), x), x)
-else replstr(x) = sprint((io, x) -> writemime(io, MIME("text/plain"), x), x) end
+if VERSION >= v"0.7.0-DEV.1472"
+    replstr(x) = sprint((io, x) -> show(IOContext(io, :limit => true), MIME("text/plain"), x), x)
+else
+    replstr(x) = sprint((io, x) -> show(IOContext(io, limit=true), MIME("text/plain"), x), x)
+end
 
 for idx in 1:length(ctxs)
     # Part #1: copy