Remove unnecessary isUnicode check; Encoding.isUnicode is accurate

jruby · Jan 9, 2018 · c2d72a3 · c2d72a3
1 parent 048632e
commit c2d72a3
Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/core/src/main/java/org/jruby/RubyString.java b/core/src/main/java/org/jruby/RubyString.java
@@ -2080,7 +2080,7 @@ public static RubyString inspect(final Ruby runtime, ByteList byteList) {
         int end = p + byteList.getRealSize();
         RubyString result = new RubyString(runtime, runtime.getString(), new ByteList(end - p));
         Encoding resultEnc = runtime.getDefaultInternalEncoding();
-        boolean isUnicode = StringSupport.isUnicode(enc);
+        boolean isUnicode = enc.isUnicode();
         boolean asciiCompat = enc.isAsciiCompatible();
 
 

diff --git a/core/src/main/java/org/jruby/util/RegexpSupport.java b/core/src/main/java/org/jruby/util/RegexpSupport.java
@@ -224,7 +224,7 @@ public static void appendRegexpString19(Ruby runtime, ByteList to, byte[] bytes,
         if (!needEscape) {
             to.append(bytes, start, len);
         } else {
-            boolean isUnicode = StringSupport.isUnicode(enc);
+            boolean isUnicode = enc.isUnicode();
             p = start;
             while (p < end) {
                 final int c;

diff --git a/core/src/main/java/org/jruby/util/StringSupport.java b/core/src/main/java/org/jruby/util/StringSupport.java
@@ -637,11 +637,6 @@ public static final void checkStringSafety(Ruby runtime, IRubyObject value) {
         }
     }
 
-    public static boolean isUnicode(Encoding enc) {
-        byte[] name = enc.getName();
-        return name.length > 4 && name[0] == 'U' && name[1] == 'T' && name[2] == 'F' && name[4] != '7';
-    }
-
     public static String escapedCharFormat(int c, boolean isUnicode) {
         String format;
         // c comparisons must be unsigned 32-bit
@@ -2430,4 +2425,9 @@ public static boolean multiByteUpcase(Encoding enc, byte[] bytes, int s, int end
     public static int encCoderangeClean(int cr) {
         return (cr ^ (cr >> 1)) & CR_7BIT;
     }
+
+    @Deprecated
+    public static boolean isUnicode(Encoding enc) {
+        return enc.isUnicode();
+    }
 }