Rollup merge of #91394 - Mark-Simulacrum:bump-stage0, r=pietroalbini
Bump stage0 compiler r? `@pietroalbini` (or anyone else)
This commit is contained in:
@@ -1111,7 +1111,11 @@ impl<'tcx> TyCtxt<'tcx> {
|
||||
};
|
||||
debug!("layout_scalar_valid_range: attr={:?}", attr);
|
||||
if let Some(
|
||||
&[ast::NestedMetaItem::Literal(ast::Lit { kind: ast::LitKind::Int(a, _), .. })],
|
||||
&[
|
||||
ast::NestedMetaItem::Literal(ast::Lit {
|
||||
kind: ast::LitKind::Int(a, _), ..
|
||||
}),
|
||||
],
|
||||
) = attr.meta_item_list().as_deref()
|
||||
{
|
||||
Bound::Included(a)
|
||||
|
||||
@@ -356,14 +356,17 @@ impl<'tcx> ClosureSubsts<'tcx> {
|
||||
/// The ordering assumed here must match that used by `ClosureSubsts::new` above.
|
||||
fn split(self) -> ClosureSubstsParts<'tcx, GenericArg<'tcx>> {
|
||||
match self.substs[..] {
|
||||
[ref parent_substs @ .., closure_kind_ty, closure_sig_as_fn_ptr_ty, tupled_upvars_ty] => {
|
||||
ClosureSubstsParts {
|
||||
parent_substs,
|
||||
closure_kind_ty,
|
||||
closure_sig_as_fn_ptr_ty,
|
||||
tupled_upvars_ty,
|
||||
}
|
||||
}
|
||||
[
|
||||
ref parent_substs @ ..,
|
||||
closure_kind_ty,
|
||||
closure_sig_as_fn_ptr_ty,
|
||||
tupled_upvars_ty,
|
||||
] => ClosureSubstsParts {
|
||||
parent_substs,
|
||||
closure_kind_ty,
|
||||
closure_sig_as_fn_ptr_ty,
|
||||
tupled_upvars_ty,
|
||||
},
|
||||
_ => bug!("closure substs missing synthetics"),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user