Fix most recenty nightly breakage due to removed await! support (#3722)

Cargo.toml

@@ -48,9 +48,9 @@ env_logger = "0.6"
 getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.8"
-rustc-ap-rustc_target = "542.0.0"
-rustc-ap-syntax = "542.0.0"
-rustc-ap-syntax_pos = "542.0.0"
+rustc-ap-rustc_target = "546.0.0"
+rustc-ap-syntax = "546.0.0"
+rustc-ap-syntax_pos = "546.0.0"
 failure = "0.1.3"
 bytecount = "0.5"
 unicode-width = "0.1.5"

src/chains.rs

@@ -168,7 +168,7 @@ impl ChainItemKind {
                 let span = mk_sp(nested.span.hi(), field.span.hi());
                 (kind, span)
             }
-            ast::ExprKind::Await(ast::AwaitOrigin::FieldLike, ref nested) => {
+            ast::ExprKind::Await(ref nested) => {
                 let span = mk_sp(nested.span.hi(), expr.span.hi());
                 (ChainItemKind::Await, span)
             }
@@ -396,9 +396,7 @@ impl Chain {
             }
             ast::ExprKind::Field(ref subexpr, _)
             | ast::ExprKind::Try(ref subexpr)
-            | ast::ExprKind::Await(ast::AwaitOrigin::FieldLike, ref subexpr) => {
-                Some(Self::convert_try(subexpr, context))
-            }
+            | ast::ExprKind::Await(ref subexpr) => Some(Self::convert_try(subexpr, context)),
             _ => None,
         }
     }

src/expr.rs

@@ -1,6 +1,5 @@
 use std::borrow::Cow;
 use std::cmp::min;
-use std::iter;
 
 use itertools::Itertools;
 use syntax::parse::token::DelimToken;
@@ -367,18 +366,7 @@ pub(crate) fn format_expr(
                 ))
             }
         }
-        ast::ExprKind::Await(ast::AwaitOrigin::FieldLike, _) => rewrite_chain(expr, context, shape),
-        ast::ExprKind::Await(ast::AwaitOrigin::MacroLike, ref nested) => {
-            overflow::rewrite_with_parens(
-                context,
-                "await!",
-                iter::once(nested),
-                shape,
-                expr.span,
-                context.config.max_width(),
-                None,
-            )
-        }
+        ast::ExprKind::Await(_) => rewrite_chain(expr, context, shape),
         ast::ExprKind::Err => None,
     };
 

tests/source/async_fn.rs

@@ -20,7 +20,9 @@ async unsafe fn rust() {
     }
 }
 
-async fn await_macro() {
-    await ! (
-        something)?;
+async fn await_try() {
+    something
+     .await
+      ?
+     ;
 }

tests/target/async_fn.rs

@@ -19,6 +19,6 @@ async unsafe fn rust() {
     }
 }
 
-async fn await_macro() {
-    await!(something)?;
+async fn await_try() {
+    something.await?;
 }