make VersionInfo(::String) a valid constructor

bradparks · Aug 12, 2014 · f7d0ebf · f7d0ebf
1 parent 71f6d99
commit f7d0ebf
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/base/pkg/reqs.jl b/base/pkg/reqs.jl
@@ -24,7 +24,7 @@ immutable Requirement <: Line
         package = shift!(fields)
         all(field->ismatch(Base.VERSION_REGEX, field), fields) ||
             error("invalid requires entry for $package: $content")
-        versions = [ convert(VersionNumber, field) for field in fields ]
+        versions = [VersionNumber(field) for field in fields]
         issorted(versions) || error("invalid requires entry for $package: $content")
         new(content, package, VersionSet(versions), system)
     end

diff --git a/base/version.jl b/base/version.jl
@@ -79,7 +79,7 @@ function split_idents(s::String)
     end
 end
 
-function convert(::Type{VersionNumber}, v::String)
+VersionNumber(v::String) = begin
     m = match(VERSION_REGEX, v)
     if m == nothing error("invalid version string: $v") end
     major, minor, patch, minus, prerl, plus, build = m.captures
@@ -94,7 +94,9 @@ function convert(::Type{VersionNumber}, v::String)
     VersionNumber(major, minor, patch, prerl, build)
 end
 
-macro v_str(v); convert(VersionNumber, v); end
+convert(::Type{VersionNumber}, v::String) = VersionNumber(v)
+
+macro v_str(v); VersionNumber(v); end 
 
 typemin(::Type{VersionNumber}) = v"0-"
 typemax(::Type{VersionNumber}) = VersionNumber(typemax(Int),typemax(Int),typemax(Int),(),("",))