Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-29 06:23:25 +00:00
Code Issues Projects Releases Packages Wiki Activity

fix: un-inline ConstScalarOrPath::from_expr_opt

Browse source
This commit is contained in:
Artur Sinila 2022-07-17 20:35:34 +03:00
parent db6a85d358
commit d9336a496c
No known key found for this signature in database
GPG key ID: 770E69D690735C61
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) => {