bootsnap 1.4.2.rc1-java → 1.4.2.rc2-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372f445ee4a9a4b33dd9270d7d073fec560ade4d
-  data.tar.gz: 9c79594666b55c9dd0b602fd8f1674844fb14e70
+  metadata.gz: f8d5ad54753db56bfcd3c4ff029c74314d8a2a42
+  data.tar.gz: c68223fa41e4ef4e2a972251d7e9dc712efa279f
 SHA512:
-  metadata.gz: b0534d195519e72bf79b41cdfaa18b125ed46504ce39e7b959269e4db4a7422b5571f344faf4e86a2b12fc7497aeba86de72bfc6005629701b79a29b778e1d35
-  data.tar.gz: 0ee63973ba993a8365a7bb4cbe4b97947eda02925ab0797f09e9156f3904a856c1d6e67e602aba1f1c64f4930dbdcf2ac26d626b7f8878d80943ed3db235b0ef
+  metadata.gz: 6d2c95079cbcd95f6143afd04d889b9677fe85e3a0661429e3f5808059bd10715ce036a4a7660a08133122897aa17d289c9f35cf258993594b8f9026ea2193d4
+  data.tar.gz: b7e23c0335ea3f580e7bd60d3de96823189b478fe24b75146320a012c1218f3db037b510647dda8e7885f0e702eabefaf6f5386eec406763aa35cb3fb4869ac4

data/lib/bootsnap/load_path_cache.rb

@@ -7,6 +7,11 @@ module Bootsnap
     DOT_SO = '.so'
     SLASH  = '/'
 
+    # If a NameError happens several levels deep, don't re-handle it
+    # all the way up the chain: mark it once and bubble it up without
+    # more retries.
+    ERROR_TAG_IVAR = :@__bootsnap_rescued
+
     DL_EXTENSIONS = ::RbConfig::CONFIG
       .values_at('DLEXT', 'DLEXT2')
       .reject { |ext| !ext || ext.empty? }

data/lib/bootsnap/load_path_cache/core_ext/active_support.rb

@@ -18,11 +18,6 @@ module Bootsnap
           Thread.current[:without_bootsnap_retry] = prev
         end
 
-        # If a NameError happens several levels deep, don't re-handle it
-        # all the way up the chain: mark it once and bubble it up without
-        # more retries.
-        ERROR_TAG_IVAR = :@__bootsnap_rescued
-
         module ClassMethods
           def autoload_paths=(o)
             super
@@ -65,8 +60,8 @@ module Bootsnap
               super
             end
           rescue NameError => e
-            raise(e) if e.instance_variable_defined?(ERROR_TAG_IVAR)
-            e.instance_variable_set(ERROR_TAG_IVAR, true)
+            raise(e) if e.instance_variable_defined?(Bootsnap::LoadPathCache::ERROR_TAG_IVAR)
+            e.instance_variable_set(Bootsnap::LoadPathCache::ERROR_TAG_IVAR, true)
 
             # This function can end up called recursively, we only want to
             # retry at the top-level.
@@ -89,8 +84,8 @@ module Bootsnap
           def depend_on(*)
             super
           rescue LoadError => e
-            raise(e) if e.instance_variable_defined?(ERROR_TAG_IVAR)
-            e.instance_variable_set(ERROR_TAG_IVAR, true)
+            raise(e) if e.instance_variable_defined?(Bootsnap::LoadPathCache::ERROR_TAG_IVAR)
+            e.instance_variable_set(Bootsnap::LoadPathCache::ERROR_TAG_IVAR, true)
 
             # If we already had cache disabled, there's no use retrying
             raise(e) if Thread.current[:without_bootsnap_cache]

data/lib/bootsnap/load_path_cache/core_ext/kernel_require.rb

@@ -3,6 +3,7 @@ module Bootsnap
     module CoreExt
       def self.make_load_error(path)
         err = LoadError.new("cannot load such file -- #{path}")
+        err.instance_variable_set(Bootsnap::LoadPathCache::ERROR_TAG_IVAR, true)
         err.define_singleton_method(:path) { path }
         err
       end
@@ -30,6 +31,9 @@ module Kernel
     end
 
     raise(Bootsnap::LoadPathCache::CoreExt.make_load_error(path))
+  rescue LoadError => e
+    e.instance_variable_set(Bootsnap::LoadPathCache::ERROR_TAG_IVAR, true)
+    raise(e)
   rescue Bootsnap::LoadPathCache::ReturnFalse
     false
   rescue Bootsnap::LoadPathCache::FallbackScan
@@ -56,6 +60,9 @@ module Kernel
     end
 
     raise(Bootsnap::LoadPathCache::CoreExt.make_load_error(path))
+  rescue LoadError => e
+    e.instance_variable_set(Bootsnap::LoadPathCache::ERROR_TAG_IVAR, true)
+    raise(e)
   rescue Bootsnap::LoadPathCache::ReturnFalse
     false
   rescue Bootsnap::LoadPathCache::FallbackScan
@@ -74,6 +81,9 @@ class Module
     # added to $LOADED_FEATURES and won't be able to hook that modification
     # since it's done in C-land.
     autoload_without_bootsnap(const, Bootsnap::LoadPathCache.load_path_cache.find(path) || path)
+  rescue LoadError => e
+    e.instance_variable_set(Bootsnap::LoadPathCache::ERROR_TAG_IVAR, true)
+    raise(e)
   rescue Bootsnap::LoadPathCache::ReturnFalse
     false
   rescue Bootsnap::LoadPathCache::FallbackScan

data/lib/bootsnap/version.rb

@@ -1,3 +1,3 @@
 module Bootsnap
-  VERSION = "1.4.2.rc1"
+  VERSION = "1.4.2.rc2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bootsnap
 version: !ruby/object:Gem::Version
-  version: 1.4.2.rc1
+  version: 1.4.2.rc2
 platform: java
 authors:
 - Burke Libbey