Returned AbortError to TVar.

Author: jdantonio

lib/concurrent/errors.rb

@@ -1,9 +1,5 @@
 module Concurrent
 
-  # Raised when a complex and atomic operation, such as a transaction,
-  # is aborted prior to completion.
-  AbortError = Class.new(StandardError)
-
   # Raised when errors occur during configuration.
   ConfigurationError = Class.new(StandardError)
 

lib/concurrent/tvar.rb

@@ -1,6 +1,5 @@
 require 'set'
 
-require 'concurrent/errors'
 require 'concurrent/atomic/thread_local_var'
 
 module Concurrent
@@ -110,7 +109,7 @@ def atomically
 
           begin
             result = yield
-          rescue Concurrent::AbortError => e
+          rescue Transaction::AbortError => e
             transaction.abort
             result = Transaction::ABORTED
           rescue => e
@@ -139,7 +138,7 @@ def atomically
 
   # Abort a currently running transaction - see `Concurrent::atomically`.
   def abort_transaction
-    raise Concurrent::AbortError.new
+    raise Transaction::AbortError.new
   end
 
   module_function :atomically, :abort_transaction
@@ -155,6 +154,8 @@ class Transaction
     ReadLogEntry = Struct.new(:tvar, :version)
     UndoLogEntry = Struct.new(:tvar, :value)
 
+    AbortError = Class.new(StandardError)
+
     def initialize
       @write_set = Set.new
       @read_log = []

spec/concurrent/tvar_spec.rb

@@ -129,7 +129,7 @@ module Concurrent
   describe '#abort_transaction' do
 
     it 'raises an exception outside an #atomically block' do
-      expect { Concurrent::abort_transaction }.to raise_error(Concurrent::AbortError)
+      expect { Concurrent::abort_transaction }.to raise_error(Concurrent::Transaction::AbortError)
     end
 
   end