bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Re-format let-else per rustfmt update

Browse source
This commit is contained in:
Mark Rousskov 2023-07-12 21:49:27 -04:00
parent 67b0cfc761
commit cc907f80b9
162 changed files with 1404 additions and 947 deletions
Download patch file Download diff file Expand all files Collapse all files

4
compiler/rustc_ty_utils/src/assoc.rs
View file

@ -215,7 +215,9 @@ fn associated_types_for_impl_traits_in_associated_fn(
}
DefKind::Impl { .. } => {
let Some(trait_fn_def_id) = tcx.associated_item(fn_def_id).trait_item_def_id else { return &[] };
let Some(trait_fn_def_id) = tcx.associated_item(fn_def_id).trait_item_def_id else {
return &[];
};
tcx.arena.alloc_from_iter(
tcx.associated_types_for_impl_traits_in_associated_fn(trait_fn_def_id).iter().map(

6
compiler/rustc_ty_utils/src/instance.rs
View file

@ -230,7 +230,8 @@ fn resolve_associated_item<'tcx>(
})
}
} else if Some(trait_ref.def_id) == lang_items.future_trait() {
let ty::Generator(generator_def_id, substs, _) = *rcvr_substs.type_at(0).kind() else {
let ty::Generator(generator_def_id, substs, _) = *rcvr_substs.type_at(0).kind()
else {
bug!()
};
if Some(trait_item_id) == tcx.lang_items().future_poll_fn() {
@ -243,7 +244,8 @@ fn resolve_associated_item<'tcx>(
Some(Instance::new(trait_item_id, rcvr_substs))
}
} else if Some(trait_ref.def_id) == lang_items.gen_trait() {
let ty::Generator(generator_def_id, substs, _) = *rcvr_substs.type_at(0).kind() else {
let ty::Generator(generator_def_id, substs, _) = *rcvr_substs.type_at(0).kind()
else {
bug!()
};
if cfg!(debug_assertions) && tcx.item_name(trait_item_id) != sym::resume {

9
compiler/rustc_ty_utils/src/layout.rs
View file

@ -525,8 +525,13 @@ fn layout_of_uncached<'tcx>(
let FieldsShape::Arbitrary { offsets: sized_offsets, .. } = &layout.fields else {
bug!("unexpected FieldsShape for sized layout of {ty:?}: {:?}", layout.fields);
};
let FieldsShape::Arbitrary { offsets: unsized_offsets, .. } = &unsized_layout.fields else {
bug!("unexpected FieldsShape for unsized layout of {ty:?}: {:?}", unsized_layout.fields);
let FieldsShape::Arbitrary { offsets: unsized_offsets, .. } =
&unsized_layout.fields
else {
bug!(
"unexpected FieldsShape for unsized layout of {ty:?}: {:?}",
unsized_layout.fields
);
};
let (sized_tail, sized_fields) = sized_offsets.raw.split_last().unwrap();

4
compiler/rustc_ty_utils/src/layout_sanity_check.rs
View file

@ -52,7 +52,7 @@ pub(super) fn sanity_check_layout<'tcx>(
let mut fields = non_zst_fields(cx, layout);
let Some(first) = fields.next() else {
// No fields here, so this could be a primitive or enum -- either way it's not a newtype around a thing
return *layout
return *layout;
};
if fields.next().is_none() {
let (offset, first) = first;
@ -77,7 +77,7 @@ pub(super) fn sanity_check_layout<'tcx>(
Abi::Uninhabited | Abi::Aggregate { .. },
"ABI unexpectedly missing alignment and/or size in {layout:#?}"
);
return
return;
};
assert_eq!(
layout.layout.align().abi,