Cleaned up code based on feedback

diff --git a/crates/hir-ty/src/consteval.rs b/crates/hir-ty/src/consteval.rs
index 11d93d19c3cfcf537bd5e21ab2fb95be50d8ec94..965bf3f2c5b84fdad49e7e6ddc2f6113a08643c5 100644 (file)
--- a/crates/hir-ty/src/consteval.rs
+++ b/crates/hir-ty/src/consteval.rs
@@ -166,12 +166,11 @@ fn get_name(variant: EnumVariantId, ctx: &mut ConstEvalCtx<'_>) -> String {
 pub fn eval_const(
     expr_id: ExprId,
     ctx: &mut ConstEvalCtx<'_>,
-    variant: Option<EnumVariantId>,
 ) -> Result<ComputedExpr, ConstEvalError> {
     let expr = &ctx.exprs[expr_id];
     match expr {
-        Expr::Missing => match variant {
-            Some(variant) => {
+        Expr::Missing => match ctx.owner {
+            DefWithBodyId::VariantId(variant) => {
                 let prev_idx: u32 = variant.local_id.into_raw().into();
                 let prev_idx = prev_idx.checked_sub(1).map(|idx| Idx::from_raw(RawIdx::from(idx)));
                 let value = match prev_idx {
@@ -198,7 +197,7 @@ pub fn eval_const(
         Expr::Literal(l) => Ok(ComputedExpr::Literal(l.clone())),
         &Expr::UnaryOp { expr, op } => {
             let ty = &ctx.expr_ty(expr);
-            let ev = eval_const(expr, ctx, None)?;
+            let ev = eval_const(expr, ctx)?;
             match op {
                 hir_def::expr::UnaryOp::Deref => Err(ConstEvalError::NotSupported("deref")),
                 hir_def::expr::UnaryOp::Not => {
@@ -254,8 +253,8 @@ pub fn eval_const(
         }
         &Expr::BinaryOp { lhs, rhs, op } => {
             let ty = &ctx.expr_ty(lhs);
-            let lhs = eval_const(lhs, ctx, None)?;
-            let rhs = eval_const(rhs, ctx, None)?;
+            let lhs = eval_const(lhs, ctx)?;
+            let rhs = eval_const(rhs, ctx)?;
             let op = op.ok_or(ConstEvalError::IncompleteExpr)?;
             let v1 = match lhs {
                 ComputedExpr::Literal(Literal::Int(v, _)) => v,
@@ -316,7 +315,7 @@ pub fn eval_const(
                             }
                         };
                         let value = match initializer {
-                            Some(x) => eval_const(x, ctx, None)?,
+                            Some(x) => eval_const(x, ctx)?,
                             None => continue,
                         };
                         if !prev_values.contains_key(&pat_id) {
@@ -332,7 +331,7 @@ pub fn eval_const(
                 }
             }
             let r = match tail {
-                &Some(x) => eval_const(x, ctx, None),
+                &Some(x) => eval_const(x, ctx),
                 None => Ok(ComputedExpr::Tuple(Box::new([]))),
             };
             // clean up local data, so caller will receive the exact map that passed to us
@@ -390,7 +389,7 @@ pub fn eval_const(
                 _ => Err(ConstEvalError::NotSupported("path that are not const or local")),
             }
         }
-        &Expr::Cast { expr, .. } => match eval_const(expr, ctx, None)? {
+        &Expr::Cast { expr, .. } => match eval_const(expr, ctx)? {
             ComputedExpr::Enum(_, _, lit) => Ok(ComputedExpr::Literal(lit)),
             _ => Err(ConstEvalError::NotSupported("Can't cast these types")),
         },
@@ -489,7 +488,6 @@ pub(crate) fn const_eval_query(
             local_data: HashMap::default(),
             infer,
         },
-        None,
     );
     result
 }
@@ -511,7 +509,6 @@ pub(crate) fn const_eval_query_variant(
             local_data: HashMap::default(),
             infer,
         },
-        Some(variant_id),
     )
 }
 
@@ -538,7 +535,7 @@ pub(crate) fn eval_to_const<'a>(
         local_data: HashMap::default(),
         infer: &ctx.result,
     };
-    let computed_expr = eval_const(expr, &mut ctx, None);
+    let computed_expr = eval_const(expr, &mut ctx);
     let const_scalar = match computed_expr {
         Ok(ComputedExpr::Literal(literal)) => literal.into(),
         _ => ConstScalar::Unknown,

diff --git a/crates/hir/src/lib.rs b/crates/hir/src/lib.rs
index b656eaa74cad75c0f15b3bdb453e62f5d81b70b4..6bcbe62efa883cd28e461980cdbb25086336129f 100644 (file)
--- a/crates/hir/src/lib.rs
+++ b/crates/hir/src/lib.rs
@@ -954,7 +954,7 @@ pub fn ty(self, db: &dyn HirDatabase) -> Type {
     }
 
     pub fn is_data_carrying(self, db: &dyn HirDatabase) -> bool {
-        self.variants(db).iter().all(|v| matches!(v.kind(db), StructKind::Unit))
+        self.variants(db).iter().any(|v| !matches!(v.kind(db), StructKind::Unit))
     }
 }
 
@@ -966,8 +966,8 @@ fn visibility(&self, db: &dyn HirDatabase) -> Visibility {
 
 #[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)]
 pub struct Variant {
-    pub parent: Enum,
-    pub id: LocalEnumVariantId,
+    pub(crate) parent: Enum,
+    pub(crate) id: LocalEnumVariantId,
 }
 
 impl Variant {

diff --git a/crates/ide/src/hover/render.rs b/crates/ide/src/hover/render.rs
index f7cdc9e5b2fdaf48b9d05c1abf1cb59a53f54097..4c429202e6f9a34aec52298d5739f1fe50955c0d 100644 (file)
--- a/crates/ide/src/hover/render.rs
+++ b/crates/ide/src/hover/render.rs
@@ -349,7 +349,7 @@ pub(super) fn definition(
         Definition::Function(it) => label_and_docs(db, it),
         Definition::Adt(it) => label_and_docs(db, it),
         Definition::Variant(it) => label_value_and_docs(db, it, |&it| {
-            if it.parent.is_data_carrying(db) {
+            if !it.parent_enum(db).is_data_carrying(db) {
                 match it.eval(db) {
                     Ok(x) => Some(format!("{}", x)),
                     Err(_) => it.value(db).map(|x| format!("{:?}", x)),