Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Switch to using re entrant mutex from rspec-support #2010

Merged
merged 1 commit into from
Jun 24, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/rspec/core/memoized_helpers.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'rspec/core/reentrant_mutex'
require 'rspec/support/reentrant_mutex'

module RSpec
module Core
Expand Down Expand Up @@ -148,7 +148,7 @@ def __init_memoized
class ThreadsafeMemoized
def initialize
@memoized = {}
@mutex = ReentrantMutex.new
@mutex = Support::ReentrantMutex.new
end

def fetch_or_store(key)
Expand Down
63 changes: 0 additions & 63 deletions lib/rspec/core/mutex.rb

This file was deleted.

52 changes: 0 additions & 52 deletions lib/rspec/core/reentrant_mutex.rb

This file was deleted.

30 changes: 0 additions & 30 deletions spec/rspec/core/reentrant_mutex_spec.rb

This file was deleted.