Fixes #6748. Inconsistent encoding when calling #to_s on arrays.#6759
Merged
enebo merged 2 commits intojruby:jruby-9.2from Jul 26, 2021
Merged
Fixes #6748. Inconsistent encoding when calling #to_s on arrays.#6759enebo merged 2 commits intojruby:jruby-9.2from
enebo merged 2 commits intojruby:jruby-9.2from
Conversation
The main problem with the original code was that we would:
```java
str.setEncoding(s.getEncoding());
```
Where s is an inspected element of the array. MRI will call
rb_enc_associate which may setEncoding but might not. In fact,
rb_enc_associate has a lot of logic which I don't really understand.
What I mean by that is that we call str.cat19 which will also do the
appropriate encoding negotiation of building up the result inspect
string. Why add this extra method into the mix?
I opted to just let cat19 do its thing and spec:ruby:fast passed.
A second change I made was to make the inspect string use default_external
unless it is an encoding which does not support ascii (which is needed since
inspect is adding ascii like '['). In the non-ascii case we just default to
US-ASCII. Thankfully spec/ruby already has specs for this.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
The main problem with the original code was that we would:
Where s is an inspected element of the array. MRI will call
rb_enc_associate which may setEncoding but might not. In fact,
rb_enc_associate has a lot of logic which I don't really understand.
What I mean by that is that we call str.cat19 which will also do the
appropriate encoding negotiation of building up the result inspect
string. Why add this extra method into the mix?
I opted to just let cat19 do its thing and spec:ruby:fast passed.
A second change I made was to make the inspect string use default_external
unless it is an encoding which does not support ascii (which is needed since
inspect is adding ascii like '['). In the non-ascii case we just default to
US-ASCII. Thankfully spec/ruby already has specs for this.