Skip to content

Commit f99469d

Browse files
committed
Change how the fn params span is calculated
Use the available Generics span field to avoid issues with `T: Fn()` bounds. This is necessary to land rust-lang#85346.
1 parent f99e358 commit f99469d

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

src/items.rs

+2-10
Original file line numberDiff line numberDiff line change
@@ -2236,26 +2236,18 @@ fn rewrite_fn_base(
22362236
result.push_str(&param_indent.to_string_with_newline(context.config));
22372237
}
22382238

2239-
// Skip `pub(crate)`.
2240-
let lo_after_visibility = get_bytepos_after_visibility(fn_sig.visibility, span);
2241-
// A conservative estimation, the goal is to be over all parens in generics
2242-
let params_start = fn_sig
2243-
.generics
2244-
.params
2245-
.last()
2246-
.map_or(lo_after_visibility, |param| param.span().hi());
22472239
let params_end = if fd.inputs.is_empty() {
22482240
context
22492241
.snippet_provider
2250-
.span_after(mk_sp(params_start, span.hi()), ")")
2242+
.span_after(mk_sp(fn_sig.generics.span.hi(), span.hi()), ")")
22512243
} else {
22522244
let last_span = mk_sp(fd.inputs[fd.inputs.len() - 1].span().hi(), span.hi());
22532245
context.snippet_provider.span_after(last_span, ")")
22542246
};
22552247
let params_span = mk_sp(
22562248
context
22572249
.snippet_provider
2258-
.span_after(mk_sp(params_start, span.hi()), "("),
2250+
.span_after(mk_sp(fn_sig.generics.span.hi(), span.hi()), "("),
22592251
params_end,
22602252
);
22612253
let param_str = rewrite_params(

0 commit comments

Comments
 (0)