diff options
author | Xavier Noria <fxn@hashref.com> | 2011-11-28 11:07:01 +0100 |
---|---|---|
committer | Xavier Noria <fxn@hashref.com> | 2011-11-28 11:07:01 +0100 |
commit | 152bd3c510a735dfb493017ecb487e931e9791a8 (patch) | |
tree | 7d8f496cc3e6617ef71cab915cda7d419449f7d0 /activesupport | |
parent | ad5c8b0d5228c32355621162e1be211208ae3f5c (diff) | |
download | rails-152bd3c510a735dfb493017ecb487e931e9791a8.tar.gz rails-152bd3c510a735dfb493017ecb487e931e9791a8.tar.bz2 rails-152bd3c510a735dfb493017ecb487e931e9791a8.zip |
Revert "Used any? instead of length call"
Reason: This is slower, and any? is not equivalent in the
general case.
See discussion in https://github.com/rails/rails/pull/3779
This reverts commit 20cbf8eddc3844126d20f1218f068889d17b0dcf.
Diffstat (limited to 'activesupport')
-rw-r--r-- | activesupport/lib/active_support/xml_mini/jdom.rb | 2 | ||||
-rw-r--r-- | activesupport/lib/active_support/xml_mini/nokogiri.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/activesupport/lib/active_support/xml_mini/jdom.rb b/activesupport/lib/active_support/xml_mini/jdom.rb index 93a8474c05..6c222b83ba 100644 --- a/activesupport/lib/active_support/xml_mini/jdom.rb +++ b/activesupport/lib/active_support/xml_mini/jdom.rb @@ -70,7 +70,7 @@ module ActiveSupport hash = get_attributes(element) child_nodes = element.child_nodes - if child_nodes.any? + if child_nodes.length > 0 for i in 0...child_nodes.length child = child_nodes.item(i) merge_element!(hash, child) unless child.node_type == Node.TEXT_NODE diff --git a/activesupport/lib/active_support/xml_mini/nokogiri.rb b/activesupport/lib/active_support/xml_mini/nokogiri.rb index fb539e9c88..04ec9e8ab8 100644 --- a/activesupport/lib/active_support/xml_mini/nokogiri.rb +++ b/activesupport/lib/active_support/xml_mini/nokogiri.rb @@ -26,7 +26,7 @@ module ActiveSupport else data.ungetc(char) doc = Nokogiri::XML(data) - raise doc.errors.first if doc.errors.any? + raise doc.errors.first if doc.errors.length > 0 doc.to_hash end end |