Skip to content

Commit fa76f60

Browse files
committed
Run cargo fmt on 1.72
1 parent 3864b43 commit fa76f60

File tree

7 files changed

+28
-18
lines changed

7 files changed

+28
-18
lines changed

crates/hir-def/src/nameres/collector.rs

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1828,7 +1828,11 @@ impl ModCollector<'_, '_> {
18281828
let Some(paths) = attr.parse_path_comma_token_tree(db.upcast(), &hygiene) else {
18291829
// `#[macro_use]` (without any paths) found, forget collected names and just import
18301830
// all visible macros.
1831-
self.def_collector.import_macros_from_extern_crate(target_crate, None, Some(extern_crate_id));
1831+
self.def_collector.import_macros_from_extern_crate(
1832+
target_crate,
1833+
None,
1834+
Some(extern_crate_id),
1835+
);
18321836
return;
18331837
};
18341838
for path in paths {

crates/hir-expand/src/builtin_fn_macro.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -692,7 +692,7 @@ pub(crate) fn include_arg_to_tt(
692692
arg_id: MacroCallId,
693693
) -> Result<(triomphe::Arc<(::tt::Subtree<::tt::TokenId>, TokenMap)>, FileId), ExpandError> {
694694
let loc = db.lookup_intern_macro_call(arg_id);
695-
let Some(EagerCallInfo { arg,arg_id, .. }) = loc.eager.as_deref() else {
695+
let Some(EagerCallInfo { arg, arg_id, .. }) = loc.eager.as_deref() else {
696696
panic!("include_arg_to_tt called on non include macro call: {:?}", &loc.eager);
697697
};
698698
let path = parse_string(&arg.0)?;

crates/hir-expand/src/hygiene.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ impl HygieneFrame {
242242
krate,
243243
call_site: None,
244244
def_site: None,
245-
}
245+
};
246246
};
247247

248248
let def_site = info.attr_input_or_mac_def_start.map(|it| db.hygiene_frame(it.file_id));

crates/hir-ty/src/infer/cast.rs

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,14 @@ impl CastCheck {
3939
}
4040

4141
fn check_ref_to_ptr_cast(expr_ty: Ty, cast_ty: Ty, table: &mut InferenceTable<'_>) -> bool {
42-
let Some((expr_inner_ty, _, _)) = expr_ty.as_reference() else { return false; };
43-
let Some((cast_inner_ty, _)) = cast_ty.as_raw_ptr() else { return false; };
44-
let TyKind::Array(expr_elt_ty, _) = expr_inner_ty.kind(Interner) else { return false; };
42+
let Some((expr_inner_ty, _, _)) = expr_ty.as_reference() else {
43+
return false;
44+
};
45+
let Some((cast_inner_ty, _)) = cast_ty.as_raw_ptr() else {
46+
return false;
47+
};
48+
let TyKind::Array(expr_elt_ty, _) = expr_inner_ty.kind(Interner) else {
49+
return false;
50+
};
4551
table.coerce(expr_elt_ty, cast_inner_ty).is_ok()
4652
}

crates/hir-ty/src/layout.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,8 @@ fn layout_of_simd_ty(
109109
// * the homogeneous field type and the number of fields.
110110
let (e_ty, e_len, is_array) = if let TyKind::Array(e_ty, _) = f0_ty.kind(Interner) {
111111
// Extract the number of elements from the layout of the array field:
112-
let FieldsShape::Array { count, .. } = db.layout_of_ty(f0_ty.clone(), env.clone())?.fields else {
112+
let FieldsShape::Array { count, .. } = db.layout_of_ty(f0_ty.clone(), env.clone())?.fields
113+
else {
113114
user_error!("Array with non array layout");
114115
};
115116

crates/hir-ty/src/mir/eval/shim/simd.rs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,9 @@ impl Evaluator<'_> {
4545
};
4646
match try_const_usize(self.db, len) {
4747
Some(len) => {
48-
let Some(ty) = subst.as_slice(Interner).get(0).and_then(|it| it.ty(Interner)) else {
48+
let Some(ty) =
49+
subst.as_slice(Interner).get(0).and_then(|it| it.ty(Interner))
50+
else {
4951
return Err(MirEvalError::TypeError("simd type with no ty param"));
5052
};
5153
Ok((len as usize, ty.clone()))

crates/hir-ty/src/mir/lower.rs

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,7 +1201,8 @@ impl<'ctx> MirLowerCtx<'ctx> {
12011201
let Some(values) = elements
12021202
.iter()
12031203
.map(|it| {
1204-
let Some((o, c)) = self.lower_expr_to_some_operand(*it, current)? else {
1204+
let Some((o, c)) = self.lower_expr_to_some_operand(*it, current)?
1205+
else {
12051206
return Ok(None);
12061207
};
12071208
current = c;
@@ -1259,7 +1260,8 @@ impl<'ctx> MirLowerCtx<'ctx> {
12591260
*expr,
12601261
rhs.project(ProjectionElem::TupleOrClosureField(i)),
12611262
span,
1262-
)? else {
1263+
)?
1264+
else {
12631265
return Ok(None);
12641266
};
12651267
current = c;
@@ -1268,8 +1270,7 @@ impl<'ctx> MirLowerCtx<'ctx> {
12681270
}
12691271
Expr::Underscore => Ok(Some(current)),
12701272
_ => {
1271-
let Some((lhs_place, current)) =
1272-
self.lower_expr_as_place(current, lhs, false)?
1273+
let Some((lhs_place, current)) = self.lower_expr_as_place(current, lhs, false)?
12731274
else {
12741275
return Ok(None);
12751276
};
@@ -1286,9 +1287,7 @@ impl<'ctx> MirLowerCtx<'ctx> {
12861287
rhs: ExprId,
12871288
span: MirSpan,
12881289
) -> Result<Option<BasicBlockId>> {
1289-
let Some((rhs_op, current)) =
1290-
self.lower_expr_to_some_operand(rhs, current)?
1291-
else {
1290+
let Some((rhs_op, current)) = self.lower_expr_to_some_operand(rhs, current)? else {
12921291
return Ok(None);
12931292
};
12941293
if matches!(&self.body.exprs[lhs], Expr::Underscore) {
@@ -1303,9 +1302,7 @@ impl<'ctx> MirLowerCtx<'ctx> {
13031302
self.push_assignment(current, temp.clone(), rhs_op.into(), span);
13041303
return self.lower_destructing_assignment(current, lhs, temp, span);
13051304
}
1306-
let Some((lhs_place, current)) =
1307-
self.lower_expr_as_place(current, lhs, false)?
1308-
else {
1305+
let Some((lhs_place, current)) = self.lower_expr_as_place(current, lhs, false)? else {
13091306
return Ok(None);
13101307
};
13111308
self.push_assignment(current, lhs_place, rhs_op.into(), span);

0 commit comments

Comments
 (0)