diff options
| author | Caleb Cartwright <calebcartwright@users.noreply.github.com> | 2021-12-02 21:29:47 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-12-02 21:29:47 -0600 |
| commit | 8da837185714cefbb261e93e9846afb11c1dc60e (patch) | |
| tree | 32704f39ca53be4c5cb1602b20478fb3d28ee1a9 | |
| parent | ec46ffd981d3d50572f1ad3f6033a7c33d27033f (diff) | |
| parent | e3053225579b7e05650274126006a8a31ef855e8 (diff) | |
| download | rust-8da837185714cefbb261e93e9846afb11c1dc60e.tar.gz rust-8da837185714cefbb261e93e9846afb11c1dc60e.zip | |
Merge pull request #5121 from calebcartwright/subtree-sync-2021-12-02
subtree sync
| -rw-r--r-- | src/items.rs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/items.rs b/src/items.rs index 3fe827ce696..f36bdba26e9 100644 --- a/src/items.rs +++ b/src/items.rs @@ -2219,18 +2219,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, ")") @@ -2238,7 +2230,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( |