Skip to content

Commit f33dec3

Browse files
committed
Address deprecation of isCompatibleTo()
1 parent 283294d commit f33dec3

File tree

6 files changed

+15
-11
lines changed

6 files changed

+15
-11
lines changed

src/main/java/org/truffleruby/core/encoding/EncodingNodes.java

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,8 @@ protected RubyEncoding negotiateSameEncodingCached(
8585
AbstractTruffleString second,
8686
RubyEncoding secondEncoding,
8787
@Cached("firstEncoding") RubyEncoding cachedEncoding) {
88-
assert first.isCompatibleTo(firstEncoding.tencoding) && second.isCompatibleTo(secondEncoding.tencoding);
88+
assert first.isCompatibleToUncached(firstEncoding.tencoding) &&
89+
second.isCompatibleToUncached(secondEncoding.tencoding);
8990
return cachedEncoding;
9091
}
9192

@@ -96,7 +97,8 @@ protected RubyEncoding negotiateSameEncodingUncached(
9697
RubyEncoding firstEncoding,
9798
AbstractTruffleString second,
9899
RubyEncoding secondEncoding) {
99-
assert first.isCompatibleTo(firstEncoding.tencoding) && second.isCompatibleTo(secondEncoding.tencoding);
100+
assert first.isCompatibleToUncached(firstEncoding.tencoding) &&
101+
second.isCompatibleToUncached(secondEncoding.tencoding);
100102
return firstEncoding;
101103
}
102104

@@ -142,7 +144,8 @@ protected RubyEncoding negotiateEncodingCached(
142144
@Cached("firstEncoding") RubyEncoding cachedFirstEncoding,
143145
@Cached("secondEncoding") RubyEncoding cachedSecondEncoding,
144146
@Cached("compatibleEncodingForStrings(first, firstEncoding, second, secondEncoding)") RubyEncoding negotiatedEncoding) {
145-
assert first.isCompatibleTo(firstEncoding.tencoding) && second.isCompatibleTo(secondEncoding.tencoding);
147+
assert first.isCompatibleToUncached(firstEncoding.tencoding) &&
148+
second.isCompatibleToUncached(secondEncoding.tencoding);
146149
return negotiatedEncoding;
147150
}
148151

@@ -152,7 +155,8 @@ protected RubyEncoding negotiateEncodingUncached(
152155
RubyEncoding firstEncoding,
153156
AbstractTruffleString second,
154157
RubyEncoding secondEncoding) {
155-
assert first.isCompatibleTo(firstEncoding.tencoding) && second.isCompatibleTo(secondEncoding.tencoding);
158+
assert first.isCompatibleToUncached(firstEncoding.tencoding) &&
159+
second.isCompatibleToUncached(secondEncoding.tencoding);
156160
return compatibleEncodingForStrings(first, firstEncoding, second, secondEncoding);
157161
}
158162

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public final class ImmutableRubyString extends ImmutableRubyObjectCopyable imple
4545
private Pointer nativeString = null;
4646

4747
ImmutableRubyString(TruffleString tstring, RubyEncoding encoding) {
48-
assert tstring.isCompatibleTo(encoding.tencoding);
48+
assert tstring.isCompatibleToUncached(encoding.tencoding);
4949
assert tstring.isManaged();
5050
this.tstring = tstring;
5151
this.encoding = encoding;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,19 +51,19 @@ public RubyString(
5151
AbstractTruffleString tstring,
5252
RubyEncoding rubyEncoding) {
5353
super(rubyClass, shape);
54-
assert tstring.isCompatibleTo(rubyEncoding.tencoding);
54+
assert tstring.isCompatibleToUncached(rubyEncoding.tencoding);
5555
this.frozen = frozen;
5656
this.tstring = tstring;
5757
this.encoding = rubyEncoding;
5858
}
5959

6060
public void setTString(AbstractTruffleString tstring) {
61-
assert tstring.isCompatibleTo(getEncodingUncached().tencoding);
61+
assert tstring.isCompatibleToUncached(getEncodingUncached().tencoding);
6262
this.tstring = tstring;
6363
}
6464

6565
public void setTString(AbstractTruffleString tstring, RubyEncoding encoding) {
66-
assert tstring.isCompatibleTo(encoding.tencoding);
66+
assert tstring.isCompatibleToUncached(encoding.tencoding);
6767
this.tstring = tstring;
6868
this.encoding = encoding;
6969
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ abstract class TStringWithEncodingBase {
2828
public final RubyEncoding encoding;
2929

3030
protected TStringWithEncodingBase(AbstractTruffleString tstring, RubyEncoding encoding) {
31-
assert tstring.isCompatibleTo(encoding.tencoding);
31+
assert tstring.isCompatibleToUncached(encoding.tencoding);
3232
this.tstring = tstring;
3333
this.encoding = encoding;
3434
}

src/main/java/org/truffleruby/core/symbol/RubySymbol.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public final class RubySymbol extends ImmutableRubyObjectNotCopyable implements
5050

5151
RubySymbol(String string, TruffleString tstring, RubyEncoding encoding, long id) {
5252
assert tstring.isManaged();
53-
assert tstring.isCompatibleTo(encoding.tencoding);
53+
assert tstring.isCompatibleToUncached(encoding.tencoding);
5454
this.encoding = encoding;
5555
this.string = string;
5656
this.tstring = tstring;

src/main/java/org/truffleruby/parser/ast/StrParseNode.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ public void setFrozen(boolean frozen) {
110110
}
111111

112112
public void setValue(TruffleString value) {
113-
assert value.isCompatibleTo(encoding.tencoding);
113+
assert value.isCompatibleToUncached(encoding.tencoding);
114114
this.value = value;
115115
}
116116
}

0 commit comments

Comments
 (0)