Skip to content

Commit ca54fc6

Browse files
committed
Turn StringFromByteArrayPrimitiveNode into a real primitive since it's only used internally by TruffleRuby.
1 parent c5982fd commit ca54fc6

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

src/main/java/org/truffleruby/core/string/StringNodes.java

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,6 @@
9898
import org.truffleruby.builtins.CoreMethodArrayArgumentsNode;
9999
import org.truffleruby.builtins.CoreMethodNode;
100100
import org.truffleruby.annotations.CoreModule;
101-
import org.truffleruby.builtins.NonStandard;
102101
import org.truffleruby.annotations.Primitive;
103102
import org.truffleruby.builtins.PrimitiveArrayArgumentsNode;
104103
import org.truffleruby.builtins.PrimitiveNode;
@@ -4328,9 +4327,8 @@ protected Object stringSubstringGeneric(Object string, int codePointOffset, int
43284327

43294328
}
43304329

4331-
@NonStandard
4332-
@CoreMethod(names = "from_bytearray", onSingleton = true, required = 4, lowerFixnum = { 2, 3 })
4333-
public abstract static class StringFromByteArrayPrimitiveNode extends CoreMethodArrayArgumentsNode {
4330+
@Primitive(name = "string_from_bytearray", lowerFixnum = { 1, 2 })
4331+
public abstract static class StringFromByteArrayPrimitiveNode extends PrimitiveArrayArgumentsNode {
43344332

43354333
@Specialization
43364334
protected RubyString stringFromByteArray(

src/main/ruby/truffleruby/core/io.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,7 @@ def shift(count = nil, encoding = Encoding::BINARY)
225225
total = size
226226
total = count if count and count < total
227227

228-
str = String.from_bytearray @storage, @start, total, encoding
228+
str = Primitive.string_from_bytearray(@storage, @start, total, encoding)
229229
@start += total
230230

231231
str

0 commit comments

Comments
 (0)