Skip to content

Commit e7330e8

Browse files
authored
[cleanup] Remove some elidable lifetimes (#843)
1 parent c3e462a commit e7330e8

File tree

2 files changed

+10
-12
lines changed

2 files changed

+10
-12
lines changed

librubyfmt/src/format_prism.rs

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -2261,9 +2261,7 @@ fn format_call_chain_segments<'src>(
22612261
}
22622262
}
22632263

2264-
fn extract_trailing_arefs<'src>(
2265-
mut elements: Vec<prism::Node<'src>>,
2266-
) -> (Vec<prism::Node<'src>>, Vec<prism::Node<'src>>) {
2264+
fn extract_trailing_arefs(mut elements: Vec<prism::Node>) -> (Vec<prism::Node>, Vec<prism::Node>) {
22672265
let mut trailing_arefs = Vec::new();
22682266
let has_dot_calls = elements.iter().any(|elem| {
22692267
elem.as_call_node()
@@ -2387,8 +2385,8 @@ fn format_call_body<'src>(
23872385
}
23882386
}
23892387

2390-
fn call_chain_elements_are_user_multilined<'src>(
2391-
ps: &ParserState<'src>,
2388+
fn call_chain_elements_are_user_multilined(
2389+
ps: &ParserState,
23922390
call_chain_elements: &[prism::Node],
23932391
) -> bool {
23942392
// Making a mutable copy since we may pop some items off later
@@ -4459,7 +4457,7 @@ fn format_next_node<'src>(ps: &mut ParserState<'src>, next_node: prism::NextNode
44594457
}
44604458
}
44614459

4462-
fn format_nil_node<'src>(ps: &mut ParserState<'src>) {
4460+
fn format_nil_node(ps: &mut ParserState) {
44634461
ps.emit_ident(b"nil");
44644462
}
44654463

@@ -4618,7 +4616,7 @@ fn format_rational_node<'src>(
46184616
);
46194617
}
46204618

4621-
fn format_redo_node<'src>(ps: &mut ParserState<'src>) {
4619+
fn format_redo_node(ps: &mut ParserState) {
46224620
ps.emit_ident(b"redo");
46234621
}
46244622

@@ -4705,7 +4703,7 @@ fn format_rescue_node<'src>(ps: &mut ParserState<'src>, rescue_node: prism::Resc
47054703
ps.at_offset(rescue_node.location().end_offset());
47064704
}
47074705

4708-
fn format_retry_node<'src>(ps: &mut ParserState<'src>) {
4706+
fn format_retry_node(ps: &mut ParserState) {
47094707
ps.emit_keyword("retry");
47104708
}
47114709

@@ -4789,7 +4787,7 @@ fn format_source_line_node<'src>(
47894787
handle_string_at_offset(ps, b"__LINE__", source_line_node.location().start_offset());
47904788
}
47914789

4792-
fn format_self_node<'src>(ps: &mut ParserState<'src>) {
4790+
fn format_self_node(ps: &mut ParserState) {
47934791
ps.emit_ident(b"self");
47944792
}
47954793

@@ -4899,7 +4897,7 @@ fn handle_string_at_offset<'src>(ps: &mut ParserState<'src>, ident: &'src [u8],
48994897
ps.emit_ident(ident);
49004898
}
49014899

4902-
fn non_null_positions<'src>(params: &prism::ParametersNode<'src>) -> [bool; 7] {
4900+
fn non_null_positions(params: &prism::ParametersNode) -> [bool; 7] {
49034901
[
49044902
!params.requireds().is_empty(),
49054903
!params.optionals().is_empty(),
@@ -4913,7 +4911,7 @@ fn non_null_positions<'src>(params: &prism::ParametersNode<'src>) -> [bool; 7] {
49134911

49144912
/// Checks if a node is an empty ParenthesesNode (like `()` in `foo ()`).
49154913
/// These should be treated as "no arguments" and the parens removed entirely.
4916-
fn is_empty_parentheses_node<'src>(node: &prism::Node<'src>) -> bool {
4914+
fn is_empty_parentheses_node(node: &prism::Node) -> bool {
49174915
if let Some(paren_node) = node.as_parentheses_node() {
49184916
match paren_node.body() {
49194917
None => true,

librubyfmt/src/line_tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ pub enum ConcreteLineTokenAndTargets<'src> {
250250
ConditionalLayoutEntry(ConditionalLayoutEntry<'src>),
251251
}
252252

253-
impl<'src> ConcreteLineTokenAndTargets<'src> {
253+
impl ConcreteLineTokenAndTargets<'_> {
254254
pub fn is_newline(&self) -> bool {
255255
match self {
256256
Self::ConcreteLineToken(clt) => clt.is_newline(),

0 commit comments

Comments
 (0)