Merge pull request #5121 from calebcartwright/subtree-sync-2021-12-02
subtree sync
This commit is contained in:
commit
8da8371857
12
src/items.rs
12
src/items.rs
|
@ -2219,18 +2219,10 @@ fn rewrite_fn_base(
|
||||||
result.push_str(¶m_indent.to_string_with_newline(context.config));
|
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() {
|
let params_end = if fd.inputs.is_empty() {
|
||||||
context
|
context
|
||||||
.snippet_provider
|
.snippet_provider
|
||||||
.span_after(mk_sp(params_start, span.hi()), ")")
|
.span_after(mk_sp(fn_sig.generics.span.hi(), span.hi()), ")")
|
||||||
} else {
|
} else {
|
||||||
let last_span = mk_sp(fd.inputs[fd.inputs.len() - 1].span().hi(), span.hi());
|
let last_span = mk_sp(fd.inputs[fd.inputs.len() - 1].span().hi(), span.hi());
|
||||||
context.snippet_provider.span_after(last_span, ")")
|
context.snippet_provider.span_after(last_span, ")")
|
||||||
|
@ -2238,7 +2230,7 @@ fn rewrite_fn_base(
|
||||||
let params_span = mk_sp(
|
let params_span = mk_sp(
|
||||||
context
|
context
|
||||||
.snippet_provider
|
.snippet_provider
|
||||||
.span_after(mk_sp(params_start, span.hi()), "("),
|
.span_after(mk_sp(fn_sig.generics.span.hi(), span.hi()), "("),
|
||||||
params_end,
|
params_end,
|
||||||
);
|
);
|
||||||
let param_str = rewrite_params(
|
let param_str = rewrite_params(
|
||||||
|
|
Loading…
Reference in a new issue