Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Avoid creating a new array of strings simply to be checked against #1141

Merged
merged 2 commits into from
Jun 1, 2019
Merged

Avoid creating a new array of strings simply to be checked against #1141

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a76aeb9
Use a constant list of encodings to check against
ashmaroli May 31, 2019
b49a086
Compare using simple strings and the `||` operator
ashmaroli Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion lib/rouge/lexer.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,9 @@ def mimetypes(*mts)

# @private
def assert_utf8!(str)
return if %w(US-ASCII UTF-8 ASCII-8BIT).include? str.encoding.name
encoding = str.encoding.name
return if encoding == 'US-ASCII' || encoding == 'UTF-8' || encoding == 'ASCII-8BIT'

raise EncodingError.new(
"Bad encoding: #{str.encoding.names.join(',')}. " +
"Please convert your string to UTF-8."
Expand Down