diff options
| author | Esteban Kuber <esteban@kuber.com.ar> | 2021-11-24 17:11:15 +0000 |
|---|---|---|
| committer | Esteban Kuber <esteban@kuber.com.ar> | 2021-11-24 20:02:16 +0000 |
| commit | d86aff8042cd06427fc3917aa2f964094c3643ec (patch) | |
| tree | 7d6c878acd1c59079053fe1200dc77dc3c2ce0a6 /src/tools/rustfmt | |
| parent | 7190bc3097a3f84c9d0e07d149eba4b00e4f8917 (diff) | |
| download | rust-d86aff8042cd06427fc3917aa2f964094c3643ec.tar.gz rust-d86aff8042cd06427fc3917aa2f964094c3643ec.zip | |
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 #85346.
Diffstat (limited to 'src/tools/rustfmt')
| -rw-r--r-- | src/tools/rustfmt/src/items.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/tools/rustfmt/src/items.rs b/src/tools/rustfmt/src/items.rs index 50121a8b6b5..acc91f861e4 100644 --- a/src/tools/rustfmt/src/items.rs +++ b/src/tools/rustfmt/src/items.rs @@ -2236,18 +2236,10 @@ fn rewrite_fn_base( result.push_str(¶m_indent.to_string_with_newline(context.config)); } - // Skip `pub(crate)`. - let lo_after_visibility = get_bytepos_after_visibility(fn_sig.visibility, span); - // A conservative estimation, the goal is to be over all parens in generics - let params_start = fn_sig - .generics - .params - .last() - .map_or(lo_after_visibility, |param| param.span().hi()); let params_end = if fd.inputs.is_empty() { context .snippet_provider - .span_after(mk_sp(params_start, span.hi()), ")") + .span_after(mk_sp(fn_sig.generics.span.hi(), span.hi()), ")") } else { let last_span = mk_sp(fd.inputs[fd.inputs.len() - 1].span().hi(), span.hi()); context.snippet_provider.span_after(last_span, ")") @@ -2255,7 +2247,7 @@ fn rewrite_fn_base( let params_span = mk_sp( context .snippet_provider - .span_after(mk_sp(params_start, span.hi()), "("), + .span_after(mk_sp(fn_sig.generics.span.hi(), span.hi()), "("), params_end, ); let param_str = rewrite_params( |