bendns' repos / rust-analyzer
Unnamed repository; edit this file 'description' to name the repository.
Diffstat (limited to 'crates/hir-ty/src/mir/lower.rs')
-rw-r--r--crates/hir-ty/src/mir/lower.rs60
1 files changed, 30 insertions, 30 deletions
diff --git a/crates/hir-ty/src/mir/lower.rs b/crates/hir-ty/src/mir/lower.rs
index 07d8147272..eb80e8706f 100644
--- a/crates/hir-ty/src/mir/lower.rs
+++ b/crates/hir-ty/src/mir/lower.rs
@@ -320,11 +320,11 @@ impl<'ctx> MirLowerCtx<'ctx> {
expr_id: ExprId,
current: BasicBlockId,
) -> Result<Option<(Operand, BasicBlockId)>> {
- if !self.has_adjustments(expr_id) {
- if let Expr::Literal(l) = &self.body[expr_id] {
- let ty = self.expr_ty_without_adjust(expr_id);
- return Ok(Some((self.lower_literal_to_operand(ty, l)?, current)));
- }
+ if !self.has_adjustments(expr_id)
+ && let Expr::Literal(l) = &self.body[expr_id]
+ {
+ let ty = self.expr_ty_without_adjust(expr_id);
+ return Ok(Some((self.lower_literal_to_operand(ty, l)?, current)));
}
let Some((p, current)) = self.lower_expr_as_place(current, expr_id, true)? else {
return Ok(None);
@@ -1039,18 +1039,18 @@ impl<'ctx> MirLowerCtx<'ctx> {
&& rhs_ty.is_scalar()
&& (lhs_ty == rhs_ty || builtin_inequal_impls)
};
- if !is_builtin {
- if let Some((func_id, generic_args)) = self.infer.method_resolution(expr_id) {
- let func = Operand::from_fn(self.db, func_id, generic_args);
- return self.lower_call_and_args(
- func,
- [*lhs, *rhs].into_iter(),
- place,
- current,
- self.is_uninhabited(expr_id),
- expr_id.into(),
- );
- }
+ if !is_builtin
+ && let Some((func_id, generic_args)) = self.infer.method_resolution(expr_id)
+ {
+ let func = Operand::from_fn(self.db, func_id, generic_args);
+ return self.lower_call_and_args(
+ func,
+ [*lhs, *rhs].into_iter(),
+ place,
+ current,
+ self.is_uninhabited(expr_id),
+ expr_id.into(),
+ );
}
if let hir_def::hir::BinaryOp::Assignment { op: Some(op) } = op {
// last adjustment is `&mut` which we don't want it.
@@ -1596,10 +1596,10 @@ impl<'ctx> MirLowerCtx<'ctx> {
fn expr_ty_after_adjustments(&self, e: ExprId) -> Ty {
let mut ty = None;
- if let Some(it) = self.infer.expr_adjustments.get(&e) {
- if let Some(it) = it.last() {
- ty = Some(it.target.clone());
- }
+ if let Some(it) = self.infer.expr_adjustments.get(&e)
+ && let Some(it) = it.last()
+ {
+ ty = Some(it.target.clone());
}
ty.unwrap_or_else(|| self.expr_ty_without_adjust(e))
}
@@ -1848,13 +1848,13 @@ impl<'ctx> MirLowerCtx<'ctx> {
self.result.param_locals.extend(params.clone().map(|(it, ty)| {
let local_id = self.result.locals.alloc(Local { ty });
self.drop_scopes.last_mut().unwrap().locals.push(local_id);
- if let Pat::Bind { id, subpat: None } = self.body[it] {
- if matches!(
+ if let Pat::Bind { id, subpat: None } = self.body[it]
+ && matches!(
self.body[id].mode,
BindingAnnotation::Unannotated | BindingAnnotation::Mutable
- ) {
- self.result.binding_locals.insert(id, local_id);
- }
+ )
+ {
+ self.result.binding_locals.insert(id, local_id);
}
local_id
}));
@@ -1887,10 +1887,10 @@ impl<'ctx> MirLowerCtx<'ctx> {
.into_iter()
.skip(base_param_count + self_binding.is_some() as usize);
for ((param, _), local) in params.zip(local_params) {
- if let Pat::Bind { id, .. } = self.body[param] {
- if local == self.binding_local(id)? {
- continue;
- }
+ if let Pat::Bind { id, .. } = self.body[param]
+ && local == self.binding_local(id)?
+ {
+ continue;
}
let r = self.pattern_match(current, None, local.into(), param)?;
if let Some(b) = r.1 {