Unnamed repository; edit this file 'description' to name the repository.
Auto merge of #12785 - Logarithmus:feature/fix-negative-const-generics, r=Veykril
fix: un-inline `ConstScalarOrPath::from_expr_opt`
Sorry, but I missed these from #12778 `@flodiebold`
| -rw-r--r-- | crates/hir-def/src/type_ref.rs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/crates/hir-def/src/type_ref.rs b/crates/hir-def/src/type_ref.rs index 867d82f45a..6be78745f1 100644 --- a/crates/hir-def/src/type_ref.rs +++ b/crates/hir-def/src/type_ref.rs @@ -411,9 +411,7 @@ impl ConstScalarOrPath { } ast::Expr::PrefixExpr(prefix_expr) => match prefix_expr.op_kind() { Some(ast::UnaryOp::Neg) => { - let unsigned = prefix_expr - .expr() - .map_or(Self::Scalar(ConstScalar::Unknown), Self::from_expr); + let unsigned = Self::from_expr_opt(prefix_expr.expr()); // Add sign match unsigned { Self::Scalar(ConstScalar::UInt(num)) => { @@ -422,7 +420,7 @@ impl ConstScalarOrPath { other => other, } } - _ => prefix_expr.expr().map_or(Self::Scalar(ConstScalar::Unknown), Self::from_expr), + _ => Self::from_expr_opt(prefix_expr.expr()), }, ast::Expr::Literal(literal) => Self::Scalar(match literal.kind() { ast::LiteralKind::IntNumber(num) => { |