Fix load paths for FFI::Generator::Task

ffi · May 17, 2019 · 17e13e2 · 17e13e2
1 parent 423082a
commit 17e13e2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 12 deletions.
diff --git a/lib/ffi/tools/generator.rb b/lib/ffi/tools/generator.rb
@@ -1,3 +1,6 @@
+require 'ffi/tools/struct_generator'
+require 'ffi/tools/const_generator'
+
 module FFI
 
   # @private

diff --git a/lib/ffi/tools/generator_task.rb b/lib/ffi/tools/generator_task.rb
@@ -1,17 +1,6 @@
-begin
-  require 'ffi/struct_generator'
-  require 'ffi/const_generator'
-  require 'ffi/generator'
-rescue LoadError
-  # from Rakefile
-  require 'lib/ffi/struct_generator'
-  require 'lib/ffi/const_generator'
-  require 'lib/ffi/generator'
-end
-
+require 'ffi/tools/generator'
 require 'rake'
 require 'rake/tasklib'
-require 'tempfile'
 
 ##
 # Rake task that calculates C structs for FFI::Struct.