API: Rename ExprKind::QuestionMark -> ExprKind::Try

Author: xFrednet

marker_api/src/ast/expr.rs

@@ -61,7 +61,7 @@ pub enum ExprKind<'ast> {
     UnaryOp(&'ast UnaryOpExpr<'ast>),
     Ref(&'ast RefExpr<'ast>),
     BinaryOp(&'ast BinaryOpExpr<'ast>),
-    QuestionMark(&'ast TryExpr<'ast>),
+    Try(&'ast TryExpr<'ast>),
     Assign(&'ast AssignExpr<'ast>),
     As(&'ast AsExpr<'ast>),
     Path(&'ast PathExpr<'ast>),
@@ -180,7 +180,7 @@ pub enum ExprPrecedence {
     Fn = 0x1000_0000,
     Index = 0x1000_0001,
 
-    QuestionMark = 0x0F00_0000,
+    Try = 0x0F00_0000,
 
     /// The unary `-` operator
     Neg = 0x0E00_0000,
@@ -249,7 +249,7 @@ macro_rules! impl_expr_kind_fn {
         impl_expr_kind_fn!((ExprKind) $method() -> $return_ty,
             IntLit, FloatLit, StrLit, CharLit, BoolLit,
             Block, Closure,
-            UnaryOp, Ref, BinaryOp, QuestionMark, As, Assign,
+            UnaryOp, Ref, BinaryOp, Try, As, Assign,
             Path, Index, Field,
             Call, Method,
             Array, Tuple, Ctor, Range,

marker_api/src/ast/expr/op_exprs.rs

@@ -189,7 +189,7 @@ impl<'ast> TryExpr<'ast> {
     }
 }
 
-super::impl_expr_data!(TryExpr<'ast>, QuestionMark);
+super::impl_expr_data!(TryExpr<'ast>, Try);
 
 #[cfg(feature = "driver-api")]
 impl<'ast> TryExpr<'ast> {

marker_rustc_driver/src/conversion/marker/expr.rs

@@ -210,7 +210,7 @@ impl<'ast, 'tcx> MarkerConverterInner<'ast, 'tcx> {
                 ExprKind::Match(self.alloc(MatchExpr::new(data, self.to_expr(scrutinee), self.to_match_arms(arms))))
             },
             hir::ExprKind::Match(_scrutinee, [_early_return, _continue], hir::MatchSource::TryDesugar(_)) => {
-                ExprKind::QuestionMark(self.alloc(self.to_try_expr_from_desugar(expr)))
+                ExprKind::Try(self.alloc(self.to_try_expr_from_desugar(expr)))
             },
             hir::ExprKind::Match(_scrutinee, [_awaitee_arm], hir::MatchSource::AwaitDesugar) => {
                 ExprKind::Await(self.alloc(self.to_await_expr_from_desugar(expr)))

marker_uilints/tests/ui/print_cond_expr.stderr

@@ -1018,7 +1018,7 @@ warning: print test
 48 |         let _print_option_match = x?;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: QuestionMark(
+   = note: Try(
                TryExpr {
                    data: CommonExprData {
                        _lifetime: PhantomData<&()>,
@@ -1063,7 +1063,7 @@ warning: print test
 54 |         let _print_result_match = x?;
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
-   = note: QuestionMark(
+   = note: Try(
                TryExpr {
                    data: CommonExprData {
                        _lifetime: PhantomData<&()>,

marker_utils/src/visitor.rs

@@ -248,7 +248,7 @@ pub fn traverse_expr<'ast, B>(
             traverse_expr(cx, visitor, e.left())?;
             traverse_expr(cx, visitor, e.right())?;
         },
-        ExprKind::QuestionMark(e) => {
+        ExprKind::Try(e) => {
             traverse_expr(cx, visitor, e.expr())?;
         },
         ExprKind::Assign(e) => {
@@ -455,7 +455,7 @@ pub trait BoolTraversable<'ast>: Traversable<'ast, bool> {
     /// refactoring.
     fn contains_return(&self, cx: &'ast AstContext<'ast>) -> bool {
         self.for_each_expr(cx, |expr| {
-            if matches!(expr, ExprKind::Return(_) | ExprKind::QuestionMark(_)) {
+            if matches!(expr, ExprKind::Return(_) | ExprKind::Try(_)) {
                 ControlFlow::Break(true)
             } else {
                 ControlFlow::Continue(())