diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2013-04-05 22:31:17 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2013-04-05 22:31:17 -0700 |
| commit | dfdc1e31a2d86a54b9aceac1869318cc921150ef (patch) | |
| tree | c97d5169fdaee64a714556f3b28fe6d43f4f765f /activesupport | |
| parent | ea3a1901371526ea67fd6736023857212bf6756c (diff) | |
| download | rails-dfdc1e31a2d86a54b9aceac1869318cc921150ef.tar.gz rails-dfdc1e31a2d86a54b9aceac1869318cc921150ef.tar.bz2 rails-dfdc1e31a2d86a54b9aceac1869318cc921150ef.zip | |
`fast_xs` support has been removed. Use 'String#encode(xml: :attr)`.
Diffstat (limited to 'activesupport')
| -rw-r--r-- | activesupport/CHANGELOG.md | 2 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string.rb | 1 | ||||
| -rw-r--r-- | activesupport/lib/active_support/core_ext/string/xchar.rb | 18 |
3 files changed, 2 insertions, 19 deletions
diff --git a/activesupport/CHANGELOG.md b/activesupport/CHANGELOG.md index 31395d6da2..3e2967f57d 100644 --- a/activesupport/CHANGELOG.md +++ b/activesupport/CHANGELOG.md @@ -1,5 +1,7 @@ ## Rails 4.0.0 (unreleased) ## +* `fast_xs` support has been removed. Use 'String#encode(xml: :attr)`. + * `ActiveSupport::Notifications::Instrumenter#instrument` should yield its payload. diff --git a/activesupport/lib/active_support/core_ext/string.rb b/activesupport/lib/active_support/core_ext/string.rb index 5d7cb81e38..c656db2c6c 100644 --- a/activesupport/lib/active_support/core_ext/string.rb +++ b/activesupport/lib/active_support/core_ext/string.rb @@ -4,7 +4,6 @@ require 'active_support/core_ext/string/multibyte' require 'active_support/core_ext/string/starts_ends_with' require 'active_support/core_ext/string/inflections' require 'active_support/core_ext/string/access' -require 'active_support/core_ext/string/xchar' require 'active_support/core_ext/string/behavior' require 'active_support/core_ext/string/output_safety' require 'active_support/core_ext/string/exclude' diff --git a/activesupport/lib/active_support/core_ext/string/xchar.rb b/activesupport/lib/active_support/core_ext/string/xchar.rb deleted file mode 100644 index f9a5b4fb64..0000000000 --- a/activesupport/lib/active_support/core_ext/string/xchar.rb +++ /dev/null @@ -1,18 +0,0 @@ -begin - # See http://fast-xs.rubyforge.org/ by Eric Wong. - # Also included with hpricot. - require 'fast_xs' -rescue LoadError - # fast_xs extension unavailable -else - begin - require 'builder' - rescue LoadError - # builder demands the first shot at defining String#to_xs - end - - class String - alias_method :original_xs, :to_xs if method_defined?(:to_xs) - alias_method :to_xs, :fast_xs - end -end |