Update syntax for Julia v1

.gitignore

@@ -1,3 +1,4 @@
 *.jl.cov
 *.jl.*.cov
 *.jl.mem
+/Manifest.toml

.travis.yml

@@ -3,13 +3,22 @@ language: julia
 os:
   - linux
   - osx
+  - windows
 julia:
-  - 0.4
+  - 1.0
+  - 1.1
+  - 1.2
+  - 1.3
   - nightly
+matrix:
+  allow_failures:
+    - julia: nightly
+  fast_finish: true
 notifications:
   email: false
-script:
-  - if [[ -a .git/shallow ]]; then git fetch --unshallow; fi
-  - julia -e 'Pkg.clone(pwd()); Pkg.build("ReadWriteLocks"); Pkg.test("ReadWriteLocks"; coverage=true)'
 after_success:
-  - julia -e 'cd(Pkg.dir("ReadWriteLocks")); Pkg.add("Coverage"); using Coverage; Codecov.submit(process_folder())'
+  - julia -e '
+      using Pkg;
+      Pkg.add("Coverage");
+      using Coverage;
+      Codecov.submit(process_folder())'

Project.toml

@@ -0,0 +1,13 @@
+name = "ReadWriteLocks"
+uuid = "c9a1755d-84d0-58e0-8f48-2f3129b1cb7a"
+authors = "Invenia Technical Computing"
+version = "0.1.0"
+
+[compat]
+julia = "1"
+
+[extras]
+Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
+
+[targets]
+test = ["Test"]

src/ReadWriteLocks.jl

@@ -1,42 +1,39 @@
 module ReadWriteLocks
 
-export ReadWriteLock, read_lock, write_lock, lock!, unlock!
-
-if isdefined(Base, :lock!)
-    import Base: lock!
-end
-
-if isdefined(Base, :unlock!)
-    import Base: unlock!
+using Base: lock, unlock
+if VERSION < v"1.2.0-DEV.28"
+    using Base.Threads: AbstractLock
+else
+    using Base: AbstractLock
 end
 
-if !isdefined(Base, :Mutex)
-    typealias Mutex ReentrantLock
-
-    lock!(x::Mutex) = lock(x)
-    unlock!(x::Mutex) = unlock(x)
-end
-
-abstract _Lock
+export ReadWriteLock, read_lock, write_lock, lock!, unlock!
 
-immutable ReadLock{T<:_Lock}
+struct ReadLock{T<:AbstractLock}
     rwlock::T
 end
 
-immutable WriteLock{T<:_Lock}
+struct WriteLock{T<:AbstractLock}
     rwlock::T
 end
 
-type ReadWriteLock <: _Lock
+# Need Julia VERSION > v"1.2.0-DEV.28` to have `ReentrantLock <: AbstractLock`
+LockTypes = Union{AbstractLock, ReentrantLock}
+mutable struct ReadWriteLock{L<:LockTypes} <: AbstractLock
     readers::Int
     writer::Bool
-    lock::Mutex  # reentrant mutex
+    lock::L  # reentrant mutex
     condition::Condition
     read_lock::ReadLock
     write_lock::WriteLock
 
-    function ReadWriteLock()
-        rwlock = new(false, 0, Mutex(), Condition())
+    function ReadWriteLock(
+        readers::Int=0,
+        writer::Bool=false,
+        lock::L=ReentrantLock(),
+        condition::Condition=Condition(),
+    ) where L <: LockTypes
+        rwlock = new{L}(readers, writer, lock, condition)
         rwlock.read_lock = ReadLock(rwlock)
         rwlock.write_lock = WriteLock(rwlock)
 
@@ -49,7 +46,7 @@ write_lock(rwlock::ReadWriteLock) = rwlock.write_lock
 
 function lock!(read_lock::ReadLock)
     rwlock = read_lock.rwlock
-    lock!(rwlock.lock)
+    lock(rwlock.lock)
 
     try
         while rwlock.writer
@@ -58,31 +55,31 @@ function lock!(read_lock::ReadLock)
 
         rwlock.readers += 1
     finally
-        unlock!(rwlock.lock)
+        unlock(rwlock.lock)
     end
 
     return nothing
 end
 
 function unlock!(read_lock::ReadLock)
     rwlock = read_lock.rwlock
-    lock!(rwlock.lock)
+    lock(rwlock.lock)
 
     try
         rwlock.readers -= 1
         if rwlock.readers == 0
             notify(rwlock.condition; all=true)
         end
     finally
-        unlock!(rwlock.lock)
+        unlock(rwlock.lock)
     end
 
     return nothing
 end
 
 function lock!(write_lock::WriteLock)
     rwlock = write_lock.rwlock
-    lock!(rwlock.lock)
+    lock(rwlock.lock)
 
     try
         while rwlock.readers > 0 || rwlock.writer
@@ -91,21 +88,21 @@ function lock!(write_lock::WriteLock)
 
         rwlock.writer = true
     finally
-        unlock!(rwlock.lock)
+        unlock(rwlock.lock)
     end
 
     return nothing
 end
 
 function unlock!(write_lock::WriteLock)
     rwlock = write_lock.rwlock
-    lock!(rwlock.lock)
+    lock(rwlock.lock)
 
     try
         rwlock.writer = false
         notify(rwlock.condition; all=true)
     finally
-        unlock!(rwlock.lock)
+        unlock(rwlock.lock)
     end
 
     return nothing