summaryrefslogtreecommitdiff
path: root/transcode.c
diff options
context:
space:
mode:
authornagachika <nagachika@ruby-lang.org>2021-07-03 14:22:06 +0900
committernagachika <nagachika@ruby-lang.org>2021-07-03 14:22:06 +0900
commit69fd46f2524ac5df5b739f0a19c71aecfa180d48 (patch)
tree0a6943608742d907151986d429c4f18f19c2df26 /transcode.c
parente62cccaeb0986d43480bccbd365cb20056bda4d7 (diff)
Revert "merge revision(s) e86c1f6fc53433ef5c82ed2b7a4cc9a12c153e4c,f6539202c52a051a4e6946a318a1d9cd29002990: [Backport #1205]"
This reverts commit e62cccaeb0986d43480bccbd365cb20056bda4d7.
Diffstat (limited to 'transcode.c')
-rw-r--r--transcode.c6
1 files changed, 0 insertions, 6 deletions
diff --git a/transcode.c b/transcode.c
index d2abd9e0e5..a72afdc44b 100644
--- a/transcode.c
+++ b/transcode.c
@@ -2719,12 +2719,6 @@ str_transcode0(int argc, VALUE *argv, VALUE *self, int ecflags, VALUE ecopts)
}
}
else {
- if (senc && denc && !rb_enc_asciicompat(senc) && !rb_enc_asciicompat(denc)) {
- rb_encoding *utf8 = rb_utf8_encoding();
- str = rb_str_conv_enc(str, senc, utf8);
- senc = utf8;
- sname = "UTF-8";
- }
if (encoding_equal(sname, dname)) {
sname = "";
dname = "";