bootsnap 1.4.2.rc1 → 1.4.2.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1b7e391a76fc9fe8cc2c712d7623f26e6138f24c62acd3cd16a470f50812e554
-  data.tar.gz: 23d068050fd8c1962915608e73418c01dc568cc5371a5d27f77a269ef2926aeb
+  metadata.gz: 83f911740073d58a217017c1aa526fa41271cb7829ef762784cbd31f613a27e9
+  data.tar.gz: 359820887978e6aebd27dbad8cf393ab094f75f4e9239a5f7309b5306c397525
 SHA512:
-  metadata.gz: 815c87a26099673845b530d5a0bb2000ceda89f15a17eeca178b087d3ae4af6230ce8dcaa15a4360a2fdb0fc8d923d0659dc47ac6a7d2b072d43eebadeaebc79
-  data.tar.gz: 46584a5b22e3a64a02302a3ea87dfbe6e99676935838560ec93f938a0c3b86e854aacd48364e4f7161c021d5472497844b3d81074e1a3cc1be82a2aac3bee158
+  metadata.gz: 49887a724d7f10bb2ca630dbd971df3d50f7f71fedc41f86b0cca5dc36af30b7654a38fada0b4cbe5fdbc78a1271d66e3c30ade756f1383d1620274c07398346
+  data.tar.gz: 0d446eab9cd2143160fe0f05f90a326c1fbbbd54af675a9ee4430e85784e44ff6680af3c62142924c68278c8d2a70f03fe1d39d931bcf5e093a9a91132755e35

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: ruby
 authors:
 - Burke Libbey