Skip to content

Commit

Permalink
Revert "Consider an autoload resolved if #resolve didn't return nil i…
Browse files Browse the repository at this point in the history
…n Autoload#call"

CodeLoader.require returning false doesn't necessarily mean the feature
got loaded.

This reverts commit 01a7c2f.

[ci skip]
  • Loading branch information
ahmadsherif committed Feb 22, 2016
1 parent 01a7c2f commit c0c778c
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion core/autoload.rb
Expand Up @@ -40,7 +40,7 @@ def call(under, honor_require=false)
if !undefined.equal?(constant) && Thread.current == thread
constant
else
worked = !resolve.nil?
worked = resolve

if !honor_require or worked
find_const under
Expand Down

3 comments on commit c0c778c

@robin850
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sad you had to revert this commit but yeah, Bundler was completely broken with the previous commit. Thanks for working on that anyway, that's not an easy one ! ❤️

@ahmadsherif
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No problem 😄 , I'll try working on it again in a couple of days.

@robin850
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome ! 👍

Please sign in to comment.