diff options
| author | Michael Wright <mikerite@lavabit.com> | 2019-05-09 05:50:58 +0200 |
|---|---|---|
| committer | Michael Wright <mikerite@lavabit.com> | 2019-05-09 05:50:58 +0200 |
| commit | 983edde284762b75f17138035958017d2b079f62 (patch) | |
| tree | 91c6b4a5a280d040014211fda8e5e1a7245b62aa | |
| parent | 5149ed40a9d8b23e36f2e6c3caa1ca00be0c8491 (diff) | |
| parent | 341c96afd331195beeb001436535c1feb479ff9d (diff) | |
| download | rust-983edde284762b75f17138035958017d2b079f62.tar.gz rust-983edde284762b75f17138035958017d2b079f62.zip | |
Merge branch 'master' into while_loop_test_split
| -rw-r--r-- | clippy_lints/src/utils/author.rs | 1 | ||||
| -rw-r--r-- | clippy_lints/src/utils/sugg.rs | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/clippy_lints/src/utils/author.rs b/clippy_lints/src/utils/author.rs index 63f94628630..ec8079f1824 100644 --- a/clippy_lints/src/utils/author.rs +++ b/clippy_lints/src/utils/author.rs @@ -684,6 +684,7 @@ fn desugaring_name(des: hir::MatchSource) -> String { "MatchSource::IfLetDesugar {{ contains_else_clause: {} }}", contains_else_clause ), + hir::MatchSource::AwaitDesugar => "MatchSource::AwaitDesugar".to_string(), } } diff --git a/clippy_lints/src/utils/sugg.rs b/clippy_lints/src/utils/sugg.rs index 3fa08e0a11c..be6e6069402 100644 --- a/clippy_lints/src/utils/sugg.rs +++ b/clippy_lints/src/utils/sugg.rs @@ -165,6 +165,7 @@ impl<'a> Sugg<'a> { | ast::ExprKind::Array(..) | ast::ExprKind::While(..) | ast::ExprKind::WhileLet(..) + | ast::ExprKind::Await(..) | ast::ExprKind::Err => Sugg::NonParen(snippet), ast::ExprKind::Range(.., RangeLimits::HalfOpen) => Sugg::BinOp(AssocOp::DotDot, snippet), ast::ExprKind::Range(.., RangeLimits::Closed) => Sugg::BinOp(AssocOp::DotDotEq, snippet), |