internal: make naming consistent

Author: matklad

crates/hir_def/src/expr.rs

@@ -219,7 +219,7 @@ pub enum ArithOp {
     BitAnd,
 }
 
-pub use syntax::ast::PrefixOp as UnaryOp;
+pub use syntax::ast::UnaryOp;
 #[derive(Debug, Clone, Eq, PartialEq)]
 pub enum Array {
     ElementList(Vec<ExprId>),

crates/ide/src/syntax_highlighting/highlight.rs

@@ -126,7 +126,7 @@ pub(super) fn element(
                 let ty = sema.type_of_expr(&expr)?.original;
                 if ty.is_raw_ptr() {
                     HlTag::Operator(HlOperator::Other) | HlMod::Unsafe
-                } else if let Some(ast::PrefixOp::Deref) = prefix_expr.op_kind() {
+                } else if let Some(ast::UnaryOp::Deref) = prefix_expr.op_kind() {
                     HlOperator::Other.into()
                 } else {
                     HlPunct::Other.into()

crates/ide_assists/src/handlers/apply_demorgan.rs

@@ -85,7 +85,7 @@ pub(crate) fn apply_demorgan(acc: &mut Assists, ctx: &AssistContext) -> Option<(
                 .and_then(|paren_expr| paren_expr.syntax().parent())
                 .and_then(ast::PrefixExpr::cast)
                 .and_then(|prefix_expr| {
-                    if prefix_expr.op_kind().unwrap() == ast::PrefixOp::Not {
+                    if prefix_expr.op_kind().unwrap() == ast::UnaryOp::Not {
                         Some(prefix_expr)
                     } else {
                         None

crates/ide_assists/src/handlers/pull_assignment_up.rs

@@ -173,8 +173,8 @@ fn is_equivalent(
             }
         }
         (ast::Expr::PrefixExpr(prefix0), ast::Expr::PrefixExpr(prefix1))
-            if prefix0.op_kind() == Some(ast::PrefixOp::Deref)
-                && prefix1.op_kind() == Some(ast::PrefixOp::Deref) =>
+            if prefix0.op_kind() == Some(ast::UnaryOp::Deref)
+                && prefix1.op_kind() == Some(ast::UnaryOp::Deref) =>
         {
             cov_mark::hit!(test_pull_assignment_up_deref);
             if let (Some(prefix0), Some(prefix1)) = (prefix0.expr(), prefix1.expr()) {

crates/ide_assists/src/utils.rs

@@ -233,7 +233,7 @@ fn invert_special_case(expr: &ast::Expr) -> Option<ast::Expr> {
             };
             Some(make::expr_method_call(receiver, make::name_ref(method), arg_list))
         }
-        ast::Expr::PrefixExpr(pe) if pe.op_kind()? == ast::PrefixOp::Not => {
+        ast::Expr::PrefixExpr(pe) if pe.op_kind()? == ast::UnaryOp::Not => {
             if let ast::Expr::ParenExpr(parexpr) = pe.expr()? {
                 parexpr.expr()
             } else {

crates/ide_assists/src/utils/suggest_name.rs

@@ -110,7 +110,7 @@ pub(crate) fn for_variable(expr: &ast::Expr, sema: &Semantics<'_, RootDatabase>)
             }
             ast::Expr::ParenExpr(inner) => next_expr = inner.expr(),
             ast::Expr::TryExpr(inner) => next_expr = inner.expr(),
-            ast::Expr::PrefixExpr(prefix) if prefix.op_kind() == Some(ast::PrefixOp::Deref) => {
+            ast::Expr::PrefixExpr(prefix) if prefix.op_kind() == Some(ast::UnaryOp::Deref) => {
                 next_expr = prefix.expr()
             }
             _ => break,

crates/syntax/src/ast.rs

@@ -24,7 +24,7 @@ pub use self::{
         AttrKind, AttrsOwnerNode, FieldKind, Macro, NameLike, NameOrNameRef, PathSegmentKind,
         SelfParamKind, SlicePatComponents, StructKind, TypeBoundKind, VisibilityKind,
     },
-    operators::{PrefixOp, RangeOp},
+    operators::{RangeOp, UnaryOp},
     token_ext::{
         CommentKind, CommentPlacement, CommentShape, HasFormatSpecifier, IsString, QuoteOffsets,
         Radix,

crates/syntax/src/ast/expr_ext.rs

@@ -5,7 +5,7 @@ use rowan::WalkEvent;
 use crate::{
     ast::{
         self,
-        operators::{PrefixOp, RangeOp},
+        operators::{RangeOp, UnaryOp},
         support, AstChildren, AstNode,
     },
     AstToken,
@@ -198,11 +198,11 @@ impl ast::IfExpr {
 }
 
 impl ast::PrefixExpr {
-    pub fn op_kind(&self) -> Option<PrefixOp> {
+    pub fn op_kind(&self) -> Option<UnaryOp> {
         let res = match self.op_token()?.kind() {
-            T![*] => PrefixOp::Deref,
-            T![!] => PrefixOp::Not,
-            T![-] => PrefixOp::Neg,
+            T![*] => UnaryOp::Deref,
+            T![!] => UnaryOp::Not,
+            T![-] => UnaryOp::Neg,
             _ => return None,
         };
         Some(res)

crates/syntax/src/ast/operators.rs

@@ -1,5 +1,5 @@
 #[derive(Copy, Clone, Debug, PartialEq, Eq, Hash)]
-pub enum PrefixOp {
+pub enum UnaryOp {
     /// The `*` operator for dereferencing
     Deref,
     /// The `!` operator for logical inversion