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

rustup rust-lang#60586 cc rust-lang#60623 changelog: none
matthiaskrgr · May 8, 2019 · 341c96a · 341c96a
2 parents 089a7be + 857c2c5
commit 341c96a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git 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
@@ -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),
-Original file line number
+Diff line change
@@ Expand Up / @@ -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(),
         }
     }
@@ Expand Down @@