user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix empty types being inserted to closure

Browse source 
cc https://github.com/rust-lang/rust/pull/54229.
This commit is contained in:
Seiichi Uchida 2018-10-07 00:52:06 +09:00
parent 5a6822c326
commit 003fc730e6
1 changed files with 3 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/items.rs
View file

@ -1816,12 +1816,9 @@ impl Rewrite for ast::FunctionRetTy {
}
}
fn is_empty_infer(context: &RewriteContext, ty: &ast::Ty) -> bool {
fn is_empty_infer(ty: &ast::Ty, pat_span: Span) -> bool {
match ty.node {
ast::TyKind::Infer => {
let original = context.snippet(ty.span);
original != "_"
}
ast::TyKind::Infer => ty.span.hi() == pat_span.hi(),
_ => false,
}
}
@ -1833,7 +1830,7 @@ impl Rewrite for ast::Arg {
.pat
.rewrite(context, Shape::legacy(shape.width, shape.indent))?;
if !is_empty_infer(context, &*self.ty) {
if !is_empty_infer(&*self.ty, self.pat.span) {
if context.config.space_before_colon() {
result.push_str(" ");
}