Skip to content
This repository was archived by the owner on Nov 30, 2024. It is now read-only.

Commit 3633d39

Browse files
mvzJonRowe
authored andcommitted
Inline hashes to silence warnings
1 parent 29c167d commit 3633d39

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

lib/rspec/support/encoded_string.rb

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,15 @@ def matching_encoding(string)
112112
string = remove_invalid_bytes(string)
113113
string.encode(@encoding)
114114
rescue Encoding::UndefinedConversionError, Encoding::InvalidByteSequenceError
115-
string.encode(@encoding, ENCODE_UNCONVERTABLE_BYTES)
115+
# ENCODE_UNCONVERTABLE_BYTES inlined here to avoid warnings on Ruby 2.7
116+
string.encode(@encoding,
117+
:invalid => :replace,
118+
:undef => :replace,
119+
:replace => REPLACE)
116120
rescue Encoding::ConverterNotFoundError
117-
string.dup.force_encoding(@encoding).encode(ENCODE_NO_CONVERTER)
121+
# ENCODE_NO_CONVERTER inlined here to avoid warnings on Ruby 2.7
122+
string.dup.force_encoding(@encoding).encode(:invalid => :replace,
123+
:replace => REPLACE)
118124
end
119125

120126
# Prevents raising ArgumentError

0 commit comments

Comments
 (0)