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

Auto merge of #4068 - matthiaskrgr:rustup_3, r=Manishearth

Browse source 
rustup https://github.com/rust-lang/rust/pull/60586

cc https://github.com/rust-lang/rust/issues/60623

changelog: none
This commit is contained in:
bors 2019-05-08 05:06:28 +00:00
commit 341c96afd3
2 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
clippy_lints/src/utils/author.rs
View file

@ -684,6 +684,7 @@ fn desugaring_name(des: hir::MatchSource) -> String {
"MatchSource::IfLetDesugar {{ contains_else_clause: {} }}", "MatchSource::IfLetDesugar {{ contains_else_clause: {} }}",
contains_else_clause contains_else_clause
), ),
hir::MatchSource::AwaitDesugar => "MatchSource::AwaitDesugar".to_string(),
} }
} }

1
clippy_lints/src/utils/sugg.rs
View file

@ -165,6 +165,7 @@ impl<'a> Sugg<'a> {
| ast::ExprKind::Array(..) | ast::ExprKind::Array(..)
| ast::ExprKind::While(..) | ast::ExprKind::While(..)
| ast::ExprKind::WhileLet(..) | ast::ExprKind::WhileLet(..)
| ast::ExprKind::Await(..)
| ast::ExprKind::Err => Sugg::NonParen(snippet), | ast::ExprKind::Err => Sugg::NonParen(snippet),
ast::ExprKind::Range(.., RangeLimits::HalfOpen) => Sugg::BinOp(AssocOp::DotDot, snippet), ast::ExprKind::Range(.., RangeLimits::HalfOpen) => Sugg::BinOp(AssocOp::DotDot, snippet),
ast::ExprKind::Range(.., RangeLimits::Closed) => Sugg::BinOp(AssocOp::DotDotEq, snippet), ast::ExprKind::Range(.., RangeLimits::Closed) => Sugg::BinOp(AssocOp::DotDotEq, snippet),