Skip to content

Commit 05afb6d

Browse files
authored
Replace loc_to_str with .as_slice() for inline comparisons (#838)
1 parent 386f6d9 commit 05afb6d

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

librubyfmt/src/format_prism.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ fn maybe_render_heredocs_in_string<'src: 'a, 'a>(
885885
.peek()
886886
.and_then(|node| {
887887
node.as_string_node()
888-
.map(|sn| loc_to_str(sn.content_loc()).starts_with('\n'))
888+
.map(|sn| sn.content_loc().as_slice().starts_with(b"\n"))
889889
})
890890
.unwrap_or(false);
891891
if should_render {
@@ -1725,7 +1725,7 @@ fn use_parens_for_call_node<'src>(
17251725
let has_brace_block = call_node
17261726
.block()
17271727
.and_then(|b| b.as_block_node())
1728-
.map(|block| loc_to_str(block.opening_loc()) != "do")
1728+
.map(|block| block.opening_loc().as_slice() != b"do")
17291729
.unwrap_or(false);
17301730

17311731
if has_arguments && has_brace_block {
@@ -2668,7 +2668,7 @@ fn format_assoc_splat_node<'src>(
26682668
}
26692669

26702670
fn format_block_node<'src>(ps: &mut ParserState<'src>, block_node: prism::BlockNode<'src>) {
2671-
if loc_to_str(block_node.opening_loc()) == "do" {
2671+
if block_node.opening_loc().as_slice() == b"do" {
26722672
ps.new_block(|ps| {
26732673
ps.emit_do_keyword();
26742674
if let Some(block_parameters) = block_node.parameters()
@@ -4231,13 +4231,13 @@ fn format_constant_write_node<'src>(
42314231
}
42324232

42334233
fn format_lambda_node<'src>(ps: &mut ParserState<'src>, lambda_node: prism::LambdaNode<'src>) {
4234-
let operator = loc_to_str(lambda_node.operator_loc());
4234+
let operator = lambda_node.operator_loc().as_slice();
42354235

42364236
ps.with_start_of_line(false, |ps| {
4237-
ps.emit_ident(operator.as_bytes());
4237+
ps.emit_ident(operator);
42384238

42394239
if let Some(parameters_node) = lambda_node.parameters() {
4240-
if operator == "->"
4240+
if operator == b"->"
42414241
&& let Some(block_parameters) = parameters_node.as_block_parameters_node()
42424242
{
42434243
if block_parameters.parameters().is_some() || !block_parameters.locals().is_empty()
@@ -4257,9 +4257,9 @@ fn format_lambda_node<'src>(ps: &mut ParserState<'src>, lambda_node: prism::Lamb
42574257
}
42584258
}
42594259

4260-
let opening = loc_to_str(lambda_node.opening_loc());
4260+
let opening = lambda_node.opening_loc().as_slice();
42614261

4262-
if opening == "do" {
4262+
if opening == b"do" {
42634263
ps.emit_space();
42644264
ps.new_block(|ps| {
42654265
ps.emit_do_keyword();
@@ -4953,12 +4953,12 @@ fn is_keyword_expression(node: &prism::Node) -> bool {
49534953
// `and` keyword (but NOT `&&` operator)
49544954
Node::AndNode { .. } => {
49554955
let and_node = node.as_and_node().unwrap();
4956-
loc_to_str(and_node.operator_loc()) == "and"
4956+
and_node.operator_loc().as_slice() == b"and"
49574957
}
49584958
// `or` keyword (but NOT `||` operator)
49594959
Node::OrNode { .. } => {
49604960
let or_node = node.as_or_node().unwrap();
4961-
loc_to_str(or_node.operator_loc()) == "or"
4961+
or_node.operator_loc().as_slice() == b"or"
49624962
}
49634963
// Case expressions
49644964
Node::CaseNode { .. } | Node::CaseMatchNode { .. } => true,

0 commit comments

Comments
 (0)