mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Auto merge of #12785 - Logarithmus:feature/fix-negative-const-generics, r=Veykril

Browse Source 
fix: un-inline `ConstScalarOrPath::from_expr_opt`

Sorry, but I missed these from #12778 `@flodiebold`
This commit is contained in:
bors 2022-07-17 17:53:02 +00:00
commit 897a7ec4b8
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/hir-def/src/type_ref.rs
View File

@ -411,9 +411,7 @@ impl ConstScalarOrPath {
} }
ast::Expr::PrefixExpr(prefix_expr) => match prefix_expr.op_kind() { ast::Expr::PrefixExpr(prefix_expr) => match prefix_expr.op_kind() {
Some(ast::UnaryOp::Neg) => { Some(ast::UnaryOp::Neg) => {
let unsigned = prefix_expr let unsigned = Self::from_expr_opt(prefix_expr.expr());
.expr()
.map_or(Self::Scalar(ConstScalar::Unknown), Self::from_expr);
// Add sign // Add sign
match unsigned { match unsigned {
Self::Scalar(ConstScalar::UInt(num)) => { Self::Scalar(ConstScalar::UInt(num)) => {
@ -422,7 +420,7 @@ impl ConstScalarOrPath {
other => other, 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::Expr::Literal(literal) => Self::Scalar(match literal.kind() {
ast::LiteralKind::IntNumber(num) => { ast::LiteralKind::IntNumber(num) => {