Merge #10080

[rust.git] / crates / hir_ty / src / consteval.rs

diff --git a/crates/hir_ty/src/consteval.rs b/crates/hir_ty/src/consteval.rs
index e3ceb3d626996ac70cf023a26fbbb7675a2faf08..0e323c3013a3700a6c76e4a17371664ce712967b 100644 (file)
--- a/crates/hir_ty/src/consteval.rs
+++ b/crates/hir_ty/src/consteval.rs
@@ -28,7 +28,10 @@ fn is_unknown(&self) -> bool {
             chalk_ir::ConstValue::Concrete(..) => false,
 
             _ => {
-                log::error!("is_unknown was called on a non-concrete constant value! {:?}", self);
+                tracing::error!(
+                    "is_unknown was called on a non-concrete constant value! {:?}",
+                    self
+                );
                 true
             }
         }
@@ -38,8 +41,7 @@ fn is_unknown(&self) -> bool {
 // FIXME: support more than just evaluating literals
 pub fn eval_usize(expr: &Expr) -> Option<u64> {
     match expr {
-        Expr::Literal(Literal::Uint(v, None))
-        | Expr::Literal(Literal::Uint(v, Some(BuiltinUint::Usize))) => (*v).try_into().ok(),
+        Expr::Literal(Literal::Uint(v, None | Some(BuiltinUint::Usize))) => (*v).try_into().ok(),
         _ => None,
     }
 }
@@ -49,7 +51,7 @@ pub fn usize_const(value: Option<u64>) -> Const {
     ConstData {
         ty: TyKind::Scalar(chalk_ir::Scalar::Uint(chalk_ir::UintTy::Usize)).intern(&Interner),
         value: ConstValue::Concrete(chalk_ir::ConcreteConst {
-            interned: value.map(|value| ConstScalar::Usize(value)).unwrap_or(ConstScalar::Unknown),
+            interned: value.map(ConstScalar::Usize).unwrap_or(ConstScalar::Unknown),
         }),
     }
     .intern(&Interner)